[Monodevelop-patches-list] r1557 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs/ReferenceDialog Internal/Project/Project Services/ParserService

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Sun May 2 00:28:31 EDT 2004


Author: tberman
Date: 2004-05-02 00:28:30 -0400 (Sun, 02 May 2004)
New Revision: 1557

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
   trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/IParserService.cs
Log:
lots of crap, blah blah blah

(soooo bored)


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-02 04:28:30 UTC (rev 1557)
@@ -1,3 +1,14 @@
+2004-05-02  Todd Berman  <tberman at sevenl.net>
+
+	* Services/ParserService/DefaultParserService.cs: expose gac lib
+	location finder
+	* Services/ParserService/AssemblyInformation.cs: remove previous fix
+	* Services/ParserService/IParserService.cs: expose gac lib location
+	finder
+	* Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs: sort properly
+	* Internal/Project/Project/ProjectReference.cs: Use parser method to
+	find gac lib location.
+
 2004-05-01  Todd Berman  <tberman at sevenl.net>
 
 	* Gui/Dialogs/TreeViewOptions.cs: notify main window that gui effecting

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs	2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs	2004-05-02 04:28:30 UTC (rev 1557)
@@ -51,7 +51,8 @@
 			treeView.AppendColumn (firstColumn);
 			treeView.AppendColumn (GettextCatalog.GetString ("Version"), new CellRendererText (), "text", 1);
 			treeView.AppendColumn (GettextCatalog.GetString ("Path"), new CellRendererText (), "text", 2);
-		
+
+			store.SetSortColumnId (0, SortType.Ascending);
 			
 			PrintCache();
 			ScrolledWindow sc = new ScrolledWindow ();

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs	2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs	2004-05-02 04:28:30 UTC (rev 1557)
@@ -9,6 +9,7 @@
 using System.IO;
 using System.Diagnostics;
 using System.Xml;
+using MonoDevelop.Core.Services;
 using MonoDevelop.Services;
 using System.ComponentModel;
 using MonoDevelop.Gui.Components;
@@ -96,10 +97,9 @@
 				case ReferenceType.Assembly:
 					return reference;
 				
-				case ReferenceType.Gac: 
-					//return GetPathToGACAssembly(this);
-					// TODO: gac on linux
-					return reference;
+				case ReferenceType.Gac:
+					string file = ((IParserService)ServiceManager.Services.GetService (typeof (IParserService))).LoadAssemblyFromGac (reference);
+					return file == String.Empty ? reference : file;
 				case ReferenceType.Project:
 					IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
 					string projectOutputLocation   = projectService.GetOutputAssemblyName(reference);

Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs	2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs	2004-05-02 04:28:30 UTC (rev 1557)
@@ -17,7 +17,10 @@
 //using ICSharpCode.SharpAssembly.PE;
 //using ICSharpCode.SharpAssembly;
 using System.Reflection;
+using MonoDevelop.Services;
+using MonoDevelop.Core.Services;
 
+
 namespace MonoDevelop.Services {
 	
 	/// <summary>
@@ -94,7 +97,7 @@
 			//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);
-			Assembly asm = null;
+			Assembly asm = null;		
 			try {
 				asm = Assembly.LoadFrom (fileName);
 				if (asm == null)

Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-05-02 04:28:30 UTC (rev 1557)
@@ -104,7 +104,7 @@
 			}
 		}
 		
-		string LoadAssemblyFromGac (string name) {
+		public string LoadAssemblyFromGac (string name) {
 			MethodInfo gac_get = typeof (System.Environment).GetMethod ("internalGetGacPath", BindingFlags.Static|BindingFlags.NonPublic);
 			
 			if (gac_get == null)

Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/IParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/IParserService.cs	2004-05-02 03:49:05 UTC (rev 1556)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/IParserService.cs	2004-05-02 04:28:30 UTC (rev 1557)
@@ -71,6 +71,7 @@
 		ArrayList IsAsResolve (string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent);
 		ArrayList CtrlSpace(IParserService parserService, int caretLine, int caretColumn, string fileName);
 		void AddReferenceToCompletionLookup(IProject project, ProjectReference reference);
+		string LoadAssemblyFromGac (string name);
 
 		event ParseInformationEventHandler ParseInformationAdded;
 		event ParseInformationEventHandler ParseInformationRemoved;




More information about the Monodevelop-patches-list mailing list