[Monodevelop-patches-list] r2250 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Internal/Project/Combine Services/Project

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2005-02-12 13:44:24 -0500 (Sat, 12 Feb 2005)
New Revision: 2250

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs
Log:
2005-02-11  Todd Berman  <tberman at off.net>

	* Services/Project/ProjectService.cs:
	* Internal/Project/Combine/CombineEntry.cs:
	Make sure the filename is valid for the format.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-02-12 04:10:04 UTC (rev 2249)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-02-12 18:44:24 UTC (rev 2250)
@@ -1,3 +1,9 @@
+2005-02-11  Todd Berman  <tberman at off.net>
+
+	* Services/Project/ProjectService.cs:
+	* Internal/Project/Combine/CombineEntry.cs:
+	Make sure the filename is valid for the format.
+
 2005-02-11  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Services/Project/ProjectService.cs: Fix default file formats.

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs	2005-02-12 04:10:04 UTC (rev 2249)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/CombineEntry.cs	2005-02-12 18:44:24 UTC (rev 2250)
@@ -64,12 +64,17 @@
 					path = parentCombine.GetRelativeChildPath (value);
 				else
 					path = value;
+				if (fileFormat != null)
+					path = fileFormat.GetValidFormatName (FileName);
 			}
 		}
 		
 		public virtual IFileFormat FileFormat {
 			get { return fileFormat; }
-			set { fileFormat = value; }
+			set {
+				fileFormat = value;
+				FileName = fileFormat.GetValidFormatName (FileName);
+			}
 		}
 		
 		public virtual string RelativeFileName {

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs	2005-02-12 04:10:04 UTC (rev 2249)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Services/Project/ProjectService.cs	2005-02-12 18:44:24 UTC (rev 2250)
@@ -151,8 +151,9 @@
 				
 				if (format == null)
 					throw new InvalidOperationException ("FileFormat not provided for combine entry '" + entry.Name + "'");
+				entry.FileName = format.GetValidFormatName (file);
 			}
-			entry.FileName = format.GetValidFormatName (file);
+			entry.FileName = file;
 			format.WriteFile (entry.FileName, entry, monitor);
 		}