[Monodevelop-patches-list] r1391 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs Services/ParserService

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

Author: tberman
Date: 2004-04-05 18:13:40 -0400 (Mon, 05 Apr 2004)
New Revision: 1391

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs
Log:
fixing radek's bug, and a translation miss


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-05 20:38:03 UTC (rev 1390)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-05 22:13:40 UTC (rev 1391)
@@ -5,6 +5,12 @@
 
 2004-04-04  Todd Berman  <tberman at sevenl.net>
 
+	* Services/ParserService/AssemblyInformation.cs: workaround mono bug
+	with Assembly.Load (byte[]). (this fixes radek's bug)
+	* Gui/Dialogs/NewProjectDialog.cs: proper string
+
+2004-04-04  Todd Berman  <tberman at sevenl.net>
+
 	* Services/ParserService/DefaultParserService.cs: fix nullref
 
 2004-04-04  John Luke  <jluke at cfl.rr.com>

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs	2004-04-05 20:38:03 UTC (rev 1390)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs	2004-04-05 22:13:40 UTC (rev 1391)
@@ -158,7 +158,7 @@
 		void PathChanged (object sender, EventArgs e)
 		{
 			ActivateIfReady ();
-			lbl_will_save_in.Text = GettextCatalog.GetString("Dialog.NewProject.ProjectAtDescription") + " " + ProjectSolution;
+			lbl_will_save_in.Text = GettextCatalog.GetString("Project will be saved at") + " " + ProjectSolution;
 		}
 		
 		public bool IsFilenameAvailable(string fileName)

Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs	2004-04-05 20:38:03 UTC (rev 1390)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs	2004-04-05 22:13:40 UTC (rev 1391)
@@ -44,6 +44,7 @@
 		
 		byte[] GetBytes(string fileName)
 		{
+			Console.WriteLine (fileName);
 			FileStream fs = System.IO.File.OpenRead(fileName);
 			long size = fs.Length;
 			byte[] outArray = new byte[size];
@@ -89,8 +90,11 @@
 					}
 				}
 			}
-			
-			System.Reflection.Assembly asm = nonLocking ? Assembly.Load(GetBytes(fileName)) : Assembly.LoadFrom(fileName);
+
+			//FIXME: Re-enable this code when the mono bug goes away, 0.32
+			//hopefully
+			//System.Reflection.Assembly asm = nonLocking ? Assembly.Load(GetBytes(fileName)) : Assembly.LoadFrom(fileName);
+			System.Reflection.Assembly asm = Assembly.LoadFrom (fileName);
 			foreach (Type type in asm.GetTypes()) {
 				if (!type.FullName.StartsWith("<") && !type.IsSpecialName && type.IsPublic) {
 					classes.Add(new ReflectionClass(type, docuNodes));