diff options
author | Mike Krüger <mkrueger@novell.com> | 2011-06-17 17:52:14 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@novell.com> | 2011-06-17 17:52:14 +0400 |
commit | 8deb7519e209a22bddc2a72ccbf4a881ac74c243 (patch) | |
tree | 0047db42de050cc4fdf2bf1746be21972a590dfd /main/src/addins/AspNet | |
parent | 35b43b743c3b2f232cdd12ec8d33619644bb5bab (diff) |
Renamed ParsedFile -> ParsedDocument again.
Diffstat (limited to 'main/src/addins/AspNet')
6 files changed, 12 insertions, 12 deletions
diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs index bdfc924343..ab79ae3fdc 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Gui/AspNetEditorExtension.cs @@ -532,7 +532,7 @@ namespace MonoDevelop.AspNet.Gui { if (!(expr is AspNetDataBindingExpression || expr is AspNetRenderExpression)) return null; - IType codeBehindClass; + ITypeDefinition codeBehindClass; ITypeResolveContext projectDatabase; GetCodeBehind (out codeBehindClass, out projectDatabase); @@ -551,7 +551,7 @@ namespace MonoDevelop.AspNet.Gui return list.Count > 0? list : null; } - void GetCodeBehind (out IType codeBehindClass, out ITypeResolveContext projectDatabase) + void GetCodeBehind (out ITypeDefinition codeBehindClass, out ITypeResolveContext projectDatabase) { codeBehindClass = null; projectDatabase = null; @@ -645,7 +645,7 @@ namespace MonoDevelop.AspNet.Gui } //find the codebehind class - IType codeBehindClass; + ITypeDefinition codeBehindClass; ITypeResolveContext projectDatabase; GetCodeBehind (out codeBehindClass, out projectDatabase); diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs index b68d06ecdd..49510bf98f 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs @@ -40,10 +40,10 @@ namespace MonoDevelop.AspNet.Parser { Project project; CodeMemberMethod methodInfo; - IType codeBehindClass; - IType codeBehindClassPart; + ITypeDefinition codeBehindClass; + ITypeDefinition codeBehindClassPart; - public SuggestedHandlerCompletionData (Project project, CodeMemberMethod methodInfo, IType codeBehindClass, IType codeBehindClassPart) + public SuggestedHandlerCompletionData (Project project, CodeMemberMethod methodInfo, ITypeDefinition codeBehindClass, ITypeDefinition codeBehindClassPart) { this.project = project; this.methodInfo = methodInfo; diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs index bcecddbe28..9e6f2ace90 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetAppProject.cs @@ -350,7 +350,7 @@ namespace MonoDevelop.AspNet if (reference.ReferenceType == ReferenceType.Gac || reference.ReferenceType == ReferenceType.Assembly) { foreach (string refPath in reference.GetReferencedFileNames (null)) if (Path.GetFileName (refPath) == dllName) - return TypeSystemService.GetAssemblyContext (TargetRuntime, refPath); + return TypeSystemService.LoadAssemblyContext (TargetRuntime, refPath); } else if (reference.ReferenceType == ReferenceType.Project && parsed.Name == reference.Reference) { var p = ParentSolution.FindProjectByName (reference.Reference) as DotNetProject; if (p == null) { @@ -363,7 +363,7 @@ namespace MonoDevelop.AspNet string path = GetAssemblyPath (assemblyName); if (path != null) - return TypeSystemService.GetAssemblyContext (TargetRuntime, path); + return TypeSystemService.LoadAssemblyContext (TargetRuntime, path); return null; } diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetSyntaxMode.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetSyntaxMode.cs index e8f71de24b..7fd9e712b9 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetSyntaxMode.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetSyntaxMode.cs @@ -106,8 +106,8 @@ namespace MonoDevelop.AspNet string GetDefaultMime () { var ideDocument = doc.Tag as MonoDevelop.Ide.Gui.Document; - if (ideDocument != null && ideDocument.ParsedFile != null) { - var parsedDocument = ideDocument.ParsedFile as AspNetParsedDocument; + if (ideDocument != null && ideDocument.ParsedDocument != null) { + var parsedDocument = ideDocument.ParsedDocument as AspNetParsedDocument; if (parsedDocument != null) return GetMimeForLanguage (parsedDocument.Info.Language) ?? "text/x-csharp"; } diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetToolboxNode.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetToolboxNode.cs index 6819cd3b44..5fb668fa73 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetToolboxNode.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/AspNetToolboxNode.cs @@ -130,7 +130,7 @@ namespace MonoDevelop.AspNet if (cls == null) return tag; - var doc = document.ParsedFile as MonoDevelop.AspNet.Parser.AspNetParsedDocument; + var doc = document.ParsedDocument as MonoDevelop.AspNet.Parser.AspNetParsedDocument; if (doc == null) return tag; diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/WebTypeManager.cs b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/WebTypeManager.cs index 93030630b6..8b5fb37aac 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/WebTypeManager.cs +++ b/main/src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet/WebTypeManager.cs @@ -84,7 +84,7 @@ namespace MonoDevelop.AspNet file = runtime.AssemblyContext.GetAssemblyLocation (file, targetFramework); if (string.IsNullOrEmpty (file)) throw new Exception ("System.Web assembly file not found for framework " + targetFramework.Id); - ITypeResolveContext dom = TypeSystemService.GetAssemblyContext (runtime, file); + ITypeResolveContext dom = TypeSystemService.LoadAssemblyContext (runtime, file); if (dom == null) throw new Exception ("System.Web parse database not found for framework " + targetFramework.Id + " file '" + file + "'"); return dom; |