Moved CreateAssemblyModelFromFile utility methods from ClassBrowserPad to separate ModelFactoryExtensions class (as extension methods).

src/Main/Base/Project/Dom/ModelFactoryExtensions.cs

@@ -0,0 +1,59 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Linq;
+using System.IO;
+using ICSharpCode.NRefactory;
+using ICSharpCode.NRefactory.TypeSystem;
+
+namespace ICSharpCode.SharpDevelop.Dom
+{
+	public static class ModelFactoryExtensions
+	{
+		/// <summary>
+		/// Creates an <see cref="ICSharpCode.SharpDevelop.Dom.IAssemblyModel"/> from a file name.
+		/// </summary>
+		/// <param name="modelFactory">Model factory.</param>
+		/// <param name="fileName">Assembly file name.</param>
+		/// <returns>Created <see cref="ICSharpCode.SharpDevelop.Dom.IAssemblyModel"/>.</returns>
+		public static IAssemblyModel CreateAssemblyModelFromFile(this IModelFactory modelFactory, string fileName)
+		{
+			var loader = new CecilLoader();
+			loader.IncludeInternalMembers = true;
+			loader.LazyLoad = true;
+			var assembly = loader.LoadAssemblyFile(fileName);
+			
+			IEntityModelContext context = new AssemblyEntityModelContext(assembly);
+			IAssemblyModel model = modelFactory.CreateAssemblyModel(context);
+			if (model is IUpdateableAssemblyModel) {
+				((IUpdateableAssemblyModel)model).Update(EmptyList<IUnresolvedTypeDefinition>.Instance, assembly.TopLevelTypeDefinitions.ToList());
+				((IUpdateableAssemblyModel) model).AssemblyName = assembly.AssemblyName;
+			}
+			return model;
+		}
+		
+		/// <summary>
+		/// Creates an <see cref="ICSharpCode.SharpDevelop.Dom.IAssemblyModel"/> from a file name and catches
+		/// errors by showing messages to user.
+		/// </summary>
+		/// <param name="modelFactory">Model factory.</param>
+		/// <param name="fileName">Assembly file name.</param>
+		/// <returns>
+		/// Created <see cref="ICSharpCode.SharpDevelop.Dom.IAssemblyModel"/> or <b>null</b>,
+		/// if model couldn't be created.
+		/// </returns>
+		public static IAssemblyModel SafelyCreateAssemblyModelFromFile(this IModelFactory modelFactory, string fileName)
+		{
+			try {
+				return modelFactory.CreateAssemblyModelFromFile(fileName);
+			} catch (BadImageFormatException) {
+				SD.MessageService.ShowWarningFormatted("{0} is not a valid .NET assembly.", Path.GetFileName(fileName));
+			} catch (FileNotFoundException) {
+				SD.MessageService.ShowWarningFormatted("{0} is not accessible or doesn't exist anymore.", fileName);
+			}
+			
+			return null;
+		}
+	}
+}

src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@@ -114,6 +114,7 @@
     <Compile Include="Dom\ModelCollectionLinq.cs" />
     <Compile Include="Dom\ImmutableModelCollection.cs" />
     <Compile Include="Dom\ModelCollectionTreeNode.cs" />
+    <Compile Include="Dom\ModelFactoryExtensions.cs" />
     <Compile Include="Dom\SimpleModelCollection.cs" />
     <Compile Include="Dom\SynchronizedModelCollection.cs" />
     <Compile Include="Editor\AvalonEditTextEditorAdapter.cs" />

src/Main/SharpDevelop/Dom/ClassBrowser/ClassBrowserPad.cs

@@ -216,54 +216,15 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 			SD.PropertyService.SetList<PersistedWorkspace>(PersistedWorkspaceSetting, persistedWorkspaces);
 		}
 		
-		public static IAssemblyModel CreateAssemblyModelFromFile(string fileName)
-		{
-			try {
-				var loader = new CecilLoader();
-				loader.IncludeInternalMembers = true;
-				loader.LazyLoad = true;
-				var assembly = loader.LoadAssemblyFile(fileName);
-				
-				IEntityModelContext context = new AssemblyEntityModelContext(assembly);
-				IAssemblyModel model = SD.GetRequiredService<IModelFactory>().CreateAssemblyModel(context);
-				if (model is IUpdateableAssemblyModel) {
-					((IUpdateableAssemblyModel)model).Update(EmptyList<IUnresolvedTypeDefinition>.Instance, assembly.TopLevelTypeDefinitions.ToList());
-					((IUpdateableAssemblyModel) model).AssemblyName = assembly.AssemblyName;
-				}
-				return model;
-			} catch (BadImageFormatException) {
-				SD.MessageService.ShowWarningFormatted("{0} is not a valid .NET assembly.", Path.GetFileName(fileName));
-			} catch (FileNotFoundException) {
-				SD.MessageService.ShowWarningFormatted("{0} is not accessible or doesn't exist anymore.", fileName);
-			}
-			
-			return null;
-		}
-		
-		static IAssemblyModel CreateAssemblyModelOrThrowException(string fileName)
-		{
-			var loader = new CecilLoader();
-			loader.IncludeInternalMembers = true;
-			loader.LazyLoad = true;
-			var assembly = loader.LoadAssemblyFile(fileName);
-			
-			IEntityModelContext context = new AssemblyEntityModelContext(assembly);
-			IAssemblyModel model = SD.GetRequiredService<IModelFactory>().CreateAssemblyModel(context);
-			if (model is IUpdateableAssemblyModel) {
-				((IUpdateableAssemblyModel)model).Update(EmptyList<IUnresolvedTypeDefinition>.Instance, assembly.TopLevelTypeDefinitions.ToList());
-				((IUpdateableAssemblyModel) model).AssemblyName = assembly.AssemblyName;
-			}
-			return model;
-		}
-		
 		static IAssemblyModel SafelyCreateAssemblyModelFromFile(string fileName)
 		{
+			var modelFactory = SD.GetRequiredService<IModelFactory>();
 			try {
-				return CreateAssemblyModelOrThrowException(fileName);
+				return modelFactory.CreateAssemblyModelFromFile(fileName);
 			} catch (Exception) {
 				// Special AssemblyModel for unresolved file references
 				IEntityModelContext unresolvedContext = new UnresolvedAssemblyEntityModelContext(Path.GetFileName(fileName), fileName);
-				IAssemblyModel unresolvedModel = SD.GetRequiredService<IModelFactory>().CreateAssemblyModel(unresolvedContext);
+				IAssemblyModel unresolvedModel = modelFactory.CreateAssemblyModel(unresolvedContext);
 				if (unresolvedModel is IUpdateableAssemblyModel) {
 					((IUpdateableAssemblyModel) unresolvedModel).AssemblyName = unresolvedContext.AssemblyName;
 				}

src/Main/SharpDevelop/Dom/ClassBrowser/Commands.cs

@@ -16,14 +16,15 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 		public override void Execute(object parameter)
 		{
 			var classBrowser = SD.GetService<IClassBrowser>();
-			if (classBrowser != null) {
+			var modelFactory = SD.GetService<IModelFactory>();
+			if ((classBrowser != null) && (modelFactory != null)) {
 				OpenFileDialog openFileDialog = new OpenFileDialog();
 				openFileDialog.Filter = "Assembly files (*.exe, *.dll)|*.exe;*.dll";
 				openFileDialog.CheckFileExists = true;
 				openFileDialog.CheckPathExists = true;
 				if (openFileDialog.ShowDialog() ?? false)
 				{
-					IAssemblyModel assemblyModel = ClassBrowserPad.CreateAssemblyModelFromFile(openFileDialog.FileName);
+					IAssemblyModel assemblyModel = modelFactory.SafelyCreateAssemblyModelFromFile(openFileDialog.FileName);
 					if (assemblyModel != null)
 						classBrowser.AssemblyList.Assemblies.Add(assemblyModel);
 				}
@@ -39,12 +40,13 @@ namespace ICSharpCode.SharpDevelop.Dom.ClassBrowser
 		public override void Execute(object parameter)
 		{
 			var classBrowser = SD.GetService<IClassBrowser>();
-			if (classBrowser != null) {
+			var modelFactory = SD.GetService<IModelFactory>();
+			if ((classBrowser != null) && (modelFactory != null)) {
 				OpenFromGacDialog gacDialog = new OpenFromGacDialog();
 				if (gacDialog.ShowDialog() ?? false)
 				{
 					foreach (string assemblyFile in gacDialog.SelectedFileNames) {
-						IAssemblyModel assemblyModel = ClassBrowserPad.CreateAssemblyModelFromFile(assemblyFile);
+						IAssemblyModel assemblyModel = modelFactory.SafelyCreateAssemblyModelFromFile(assemblyFile);
 						if (assemblyModel != null)
 							classBrowser.AssemblyList.Assemblies.Add(assemblyModel);
 					}