* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs:

* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectDescriptor.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CombineDescriptor.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs:
* main/src/addins/AspNetAddIn/MonoDevelop.AspNet/AspNetFileDescriptionTemplate.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplateReference.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SolutionItemDescriptor.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileDescriptionTemplate.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ISolutionItemDescriptor.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/StandardHeaderService.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs:
* main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ResourceFileDescriptionTemplate.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/CodeTranslationFileDescriptionTemplate.cs:
  Propagate a policy parent SolutionItem through project/file creation
  so that policies can always be resolved correctly.

svn path=/branches/mhutch/monodevelop-policies/; revision=125195

1 files changed, 12 insertions, 8 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/StandardHeaderService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/StandardHeaderService.cs
index 3c0374a5a4..41b86f9c8d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/StandardHeaderService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.StandardHeader/StandardHeaderService.cs
@@ -51,21 +51,26 @@ namespace MonoDevelop.Ide.StandardHeader
 			return null;
 		}
 		
-		public static string GetHeader (Project parentProject, string language, string fileName, bool newFile)
+		public static string GetHeader (SolutionItem policyParent, string language, string fileName, bool newFile)
+		{
+			StandardHeaderPolicy policy = policyParent != null
+				? policyParent.Policies.Get<StandardHeaderPolicy> ()
+				: MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<StandardHeaderPolicy> ();
+			AuthorInformation authorInfo = IdeApp.Workspace.GetAuthorInformation (policyParent);
+			
+			return GetHeader (authorInfo, policy, language, fileName, newFile);
+		}
+		
+		public static string GetHeader (AuthorInformation authorInfo, StandardHeaderPolicy policy,
+		                                string language, string fileName, bool newFile)
 		{
 			string comment = GetComment (language);
 			if (comment == null)
 				return "";
-			
-			StandardHeaderPolicy policy = parentProject != null
-				? parentProject.Policies.Get<StandardHeaderPolicy> ()
-				: MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<StandardHeaderPolicy> ();
 				
 			if (string.IsNullOrEmpty (policy.Text) || (newFile && !policy.IncludeInNewFiles))
 				return "";
 			
-			AuthorInformation authorInfo = IdeApp.Workspace.GetAuthorInformation (parentProject);
-			
 			StringBuilder result = new StringBuilder (policy.Text.Length);
 			string[] lines = policy.Text.Split ('\n');
 			foreach (string line in lines) {
@@ -83,7 +88,6 @@ namespace MonoDevelop.Ide.StandardHeader
 				{ "AuthorName", authorInfo.Name },
 				{ "AuthorEmail", authorInfo.Email },
 				{ "CopyrightHolder", authorInfo.Copyright },
-				{ "ProjectName", parentProject == null? "" : parentProject.Name }
 			});
 		}
 	}