Analyzer code clean-up.

ILSpy/BamlDecompiler.cs

@@ -400,8 +400,8 @@ namespace ICSharpCode.ILSpy.Baml
 				BamlDecompiler decompiler = CreateBamlDecompilerInAppDomain(ref bamlDecompilerAppDomain, asm.FileName);
 				
 				MemoryStream bamlStream = new MemoryStream();
-				data.Position = 0;
-				data.CopyTo(bamlStream);
+				Data.Position = 0;
+				Data.CopyTo(bamlStream);
 				
 				output.Write(decompiler.DecompileBaml(bamlStream, asm.FileName, new ConnectMethodDecompiler(asm), new AssemblyResolver(asm)));
 				return true;

ILSpy/ILSpy.csproj

@@ -178,11 +178,11 @@
     <Compile Include="TextView\ReferenceElementGenerator.cs" />
     <Compile Include="TextView\AvalonEditTextOutput.cs" />
     <Compile Include="TextView\UIElementGenerator.cs" />
-    <Compile Include="TreeNodes\Analyzer\AnalyzedFieldAccessNode.cs" />
-    <Compile Include="TreeNodes\Analyzer\AnalyzedFieldNode.cs" />
+    <Compile Include="TreeNodes\Analyzer\AnalyzedFieldAccessTreeNode.cs" />
+    <Compile Include="TreeNodes\Analyzer\AnalyzedFieldTreeNode.cs" />
     <Compile Include="TreeNodes\Analyzer\AnalyzedMethodTreeNode.cs" />
     <Compile Include="TreeNodes\Analyzer\AnalyzedMethodUsedByTreeNode.cs" />
-    <Compile Include="TreeNodes\Analyzer\AnalyzedMethodUsesNode.cs" />
+    <Compile Include="TreeNodes\Analyzer\AnalyzedMethodUsesTreeNode.cs" />
     <Compile Include="TreeNodes\Analyzer\AnalyzerTreeNode.cs" />
     <Compile Include="TreeNodes\Analyzer\AnalyzedMethodOverridesTreeNode.cs" />
     <Compile Include="TreeNodes\AssemblyListTreeNode.cs" />

ILSpy/TreeNodes/Analyzer/AnalyzeContextMenuEntry.cs

@@ -24,7 +24,7 @@ using Mono.Cecil;
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
 	[ExportContextMenuEntry(Header = "Analyze", Icon = "images/Search.png")]
-	sealed class AnalyzeContextMenuEntry : IContextMenuEntry
+	internal sealed class AnalyzeContextMenuEntry : IContextMenuEntry
 	{
 		public bool IsVisible(SharpTreeNode[] selectedNodes)
 		{
@@ -41,6 +41,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 					|| Analyzer.AnalyzedEventTreeNode.CanShow(node.Member)))
 					return false;
 			}
+
 			return true;
 		}
 
@@ -54,7 +55,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 					MainWindow.Instance.AddToAnalyzer(new AnalyzedTypeTreeNode(type));
 				FieldDefinition field = node.Member as FieldDefinition;
 				if (field != null)
-					MainWindow.Instance.AddToAnalyzer(new AnalyzedFieldNode(field));
+					MainWindow.Instance.AddToAnalyzer(new AnalyzedFieldTreeNode(field));
 				MethodDefinition method = node.Member as MethodDefinition;
 				if (method != null)
 					MainWindow.Instance.AddToAnalyzer(new AnalyzedMethodTreeNode(method));

ILSpy/TreeNodes/Analyzer/AnalyzedEventAccessorsTreeNode.cs

@@ -21,15 +21,12 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	public class AnalyzedEventAccessorsTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedEventAccessorsTreeNode : AnalyzerTreeNode
 	{
-		EventDefinition analyzedEvent;
-
 		public AnalyzedEventAccessorsTreeNode(EventDefinition analyzedEvent)
 		{
 			if (analyzedEvent == null)
 				throw new ArgumentNullException("analyzedEvent");
-			this.analyzedEvent = analyzedEvent;
 
 			if (analyzedEvent.AddMethod != null)
 				this.Children.Add(new AnalyzedEventAccessorTreeNode(analyzedEvent.AddMethod, "add"));
@@ -54,9 +51,9 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			return !MainWindow.Instance.CurrentLanguage.ShowMember(property.AddMethod ?? property.RemoveMethod);
 		}
 
-		class AnalyzedEventAccessorTreeNode : AnalyzedMethodTreeNode
+		internal class AnalyzedEventAccessorTreeNode : AnalyzedMethodTreeNode
 		{
-			string name;
+			private string name;
 
 			public AnalyzedEventAccessorTreeNode(MethodDefinition analyzedMethod, string name)
 				: base(analyzedMethod)

ILSpy/TreeNodes/Analyzer/AnalyzedEventOverridesTreeNode.cs

@@ -27,10 +27,10 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedEventOverridesTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedEventOverridesTreeNode : AnalyzerTreeNode
 	{
-		readonly EventDefinition analyzedEvent;
-		readonly ThreadingSupport threading;
+		private readonly EventDefinition analyzedEvent;
+		private readonly ThreadingSupport threading;
 
 		public AnalyzedEventOverridesTreeNode(EventDefinition analyzedEvent)
 		{
@@ -44,7 +44,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 
 		public override object Text
 		{
-			get { return "Overriden By"; }
+			get { return "Overridden By"; }
 		}
 
 		public override object Icon
@@ -66,19 +66,20 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			return FindReferences(MainWindow.Instance.CurrentAssemblyList.GetAssemblies(), ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferences(IEnumerable<LoadedAssembly> assemblies, CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FindReferences(IEnumerable<LoadedAssembly> assemblies, CancellationToken ct)
 		{
 			assemblies = assemblies.Where(asm => asm.AssemblyDefinition != null);
+
 			// use parallelism only on the assembly level (avoid locks within Cecil)
 			return assemblies.AsParallel().WithCancellation(ct).SelectMany((LoadedAssembly asm) => FindReferences(asm, ct));
 		}
 
-		IEnumerable<SharpTreeNode> FindReferences(LoadedAssembly asm, CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FindReferences(LoadedAssembly asm, CancellationToken ct)
 		{
 			string asmName = asm.AssemblyDefinition.Name.Name;
 			string name = analyzedEvent.Name;

ILSpy/TreeNodes/Analyzer/AnalyzedEventTreeNode.cs

@@ -21,15 +21,15 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedEventTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedEventTreeNode : AnalyzerTreeNode
 	{
-		EventDefinition analyzedEvent;
-		string prefix;
+		private readonly EventDefinition analyzedEvent;
+		private readonly string prefix;
 
 		public AnalyzedEventTreeNode(EventDefinition analyzedEvent, string prefix = "")
 		{
 			if (analyzedEvent == null)
-				throw new ArgumentNullException("analyzedMethod");
+				throw new ArgumentNullException("analyzedEvent");
 			this.analyzedEvent = analyzedEvent;
 			this.prefix = prefix;
 			this.LazyLoading = true;

ILSpy/TreeNodes/Analyzer/AnalyzedFieldAccessTreeNode.cs

@@ -25,13 +25,13 @@ using Mono.Cecil.Cil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedFieldAccessNode : AnalyzerTreeNode
+	internal sealed class AnalyzedFieldAccessTreeNode : AnalyzerTreeNode
 	{
-		readonly bool showWrites; // true: show writes; false: show read access
-		readonly FieldDefinition analyzedField;
-		readonly ThreadingSupport threading;
+		private readonly bool showWrites; // true: show writes; false: show read access
+		private readonly FieldDefinition analyzedField;
+		private readonly ThreadingSupport threading;
 
-		public AnalyzedFieldAccessNode(FieldDefinition analyzedField, bool showWrites)
+		public AnalyzedFieldAccessTreeNode(FieldDefinition analyzedField, bool showWrites)
 		{
 			if (analyzedField == null)
 				throw new ArgumentNullException("analyzedField");
@@ -66,13 +66,13 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			var analyzer = new ScopedWhereUsedScopeAnalyzer<SharpTreeNode>(analyzedField, FindReferencesInType);
 			return analyzer.PerformAnalysis(ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
+		private IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
 		{
 			string name = analyzedField.Name;
 			string declTypeName = analyzedField.DeclaringType.FullName;
@@ -84,7 +84,9 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 				foreach (Instruction instr in method.Body.Instructions) {
 					if (CanBeReference(instr.OpCode.Code)) {
 						FieldReference fr = instr.Operand as FieldReference;
-						if (fr != null && fr.Name == name && Helpers.IsReferencedBy(analyzedField.DeclaringType, fr.DeclaringType) && fr.Resolve() == analyzedField) {
+						if (fr != null && fr.Name == name && 
+							Helpers.IsReferencedBy(analyzedField.DeclaringType, fr.DeclaringType) && 
+							fr.Resolve() == analyzedField) {
 							found = true;
 							break;
 						}
@@ -98,7 +100,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		bool CanBeReference(Code code)
+		private bool CanBeReference(Code code)
 		{
 			switch (code) {
 				case Code.Ldfld:

ILSpy/TreeNodes/Analyzer/AnalyzedFieldTreeNode.cs

@@ -21,11 +21,11 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedFieldNode : AnalyzerTreeNode, IMemberTreeNode
+	internal class AnalyzedFieldTreeNode : AnalyzerTreeNode, IMemberTreeNode
 	{
-		FieldDefinition analyzedField;
+		private readonly FieldDefinition analyzedField;
 
-		public AnalyzedFieldNode(FieldDefinition analyzedField)
+		public AnalyzedFieldTreeNode(FieldDefinition analyzedField)
 		{
 			if (analyzedField == null)
 				throw new ArgumentNullException("analyzedField");
@@ -55,9 +55,9 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 
 		protected override void LoadChildren()
 		{
-			this.Children.Add(new AnalyzedFieldAccessNode(analyzedField, false));
+			this.Children.Add(new AnalyzedFieldAccessTreeNode(analyzedField, false));
 			if (!analyzedField.IsLiteral)
-				this.Children.Add(new AnalyzedFieldAccessNode(analyzedField, true));
+				this.Children.Add(new AnalyzedFieldAccessTreeNode(analyzedField, true));
 		}
 
 		MemberReference IMemberTreeNode.Member

ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceEventImplementedByTreeNode.cs

@@ -26,11 +26,11 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedInterfaceEventImplementedByTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedInterfaceEventImplementedByTreeNode : AnalyzerTreeNode
 	{
-		EventDefinition analyzedEvent;
-		MethodDefinition analyzedMethod;
-		ThreadingSupport threading;
+		private readonly EventDefinition analyzedEvent;
+		private readonly MethodDefinition analyzedMethod;
+		private readonly ThreadingSupport threading;
 
 		public AnalyzedInterfaceEventImplementedByTreeNode(EventDefinition analyzedEvent)
 		{
@@ -67,14 +67,14 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			ScopedWhereUsedScopeAnalyzer<SharpTreeNode> analyzer;
 			analyzer = new ScopedWhereUsedScopeAnalyzer<SharpTreeNode>(analyzedMethod, FindReferencesInType);
 			return analyzer.PerformAnalysis(ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
+		private IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
 		{
 			if (!type.HasInterfaces)
 				yield break;

ILSpy/TreeNodes/Analyzer/AnalyzedInterfaceMethodImplementedByTreeNode.cs

@@ -26,10 +26,10 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedInterfaceMethodImplementedByTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedInterfaceMethodImplementedByTreeNode : AnalyzerTreeNode
 	{
-		MethodDefinition analyzedMethod;
-		ThreadingSupport threading;
+		private readonly MethodDefinition analyzedMethod;
+		private readonly ThreadingSupport threading;
 
 		public AnalyzedInterfaceMethodImplementedByTreeNode(MethodDefinition analyzedMethod)
 		{
@@ -65,14 +65,14 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			ScopedWhereUsedScopeAnalyzer<SharpTreeNode> analyzer;
 			analyzer = new ScopedWhereUsedScopeAnalyzer<SharpTreeNode>(analyzedMethod, FindReferencesInType);
 			return analyzer.PerformAnalysis(ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
+		private IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
 		{
 			if (!type.HasInterfaces)
 				yield break;

ILSpy/TreeNodes/Analyzer/AnalyzedInterfacePropertyImplementedByTreeNode.cs

@@ -26,11 +26,11 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedInterfacePropertyImplementedByTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedInterfacePropertyImplementedByTreeNode : AnalyzerTreeNode
 	{
-		PropertyDefinition analyzedProperty;
-		MethodDefinition analyzedMethod;
-		ThreadingSupport threading;
+		private readonly PropertyDefinition analyzedProperty;
+		private readonly MethodDefinition analyzedMethod;
+		private readonly ThreadingSupport threading;
 
 		public AnalyzedInterfacePropertyImplementedByTreeNode(PropertyDefinition analyzedProperty)
 		{
@@ -67,14 +67,14 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			ScopedWhereUsedScopeAnalyzer<SharpTreeNode> analyzer;
 			analyzer = new ScopedWhereUsedScopeAnalyzer<SharpTreeNode>(analyzedMethod, FindReferencesInType);
 			return analyzer.PerformAnalysis(ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
+		private IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
 		{
 			if (!type.HasInterfaces)
 				yield break;

ILSpy/TreeNodes/Analyzer/AnalyzedMethodOverridesTreeNode.cs

@@ -14,10 +14,10 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 	/// <summary>
 	/// Searches for overrides of the analyzed method.
 	/// </summary>
-	class AnalyzedMethodOverridesTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedMethodOverridesTreeNode : AnalyzerTreeNode
 	{
-		readonly MethodDefinition analyzedMethod;
-		readonly ThreadingSupport threading;
+		private readonly MethodDefinition analyzedMethod;
+		private readonly ThreadingSupport threading;
 
 		public AnalyzedMethodOverridesTreeNode(MethodDefinition analyzedMethod)
 		{
@@ -46,33 +46,32 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 
 		protected override void OnCollapsing()
 		{
-			if (threading.IsRunning)
-			{
+			if (threading.IsRunning) {
 				this.LazyLoading = true;
 				threading.Cancel();
 				this.Children.Clear();
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			return FindReferences(MainWindow.Instance.CurrentAssemblyList.GetAssemblies(), ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferences(IEnumerable<LoadedAssembly> assemblies, CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FindReferences(IEnumerable<LoadedAssembly> assemblies, CancellationToken ct)
 		{
 			assemblies = assemblies.Where(asm => asm.AssemblyDefinition != null);
+
 			// use parallelism only on the assembly level (avoid locks within Cecil)
 			return assemblies.AsParallel().WithCancellation(ct).SelectMany((LoadedAssembly asm) => FindReferences(asm, ct));
 		}
 
-		IEnumerable<SharpTreeNode> FindReferences(LoadedAssembly asm, CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FindReferences(LoadedAssembly asm, CancellationToken ct)
 		{
 			string asmName = asm.AssemblyDefinition.Name.Name;
 			string name = analyzedMethod.Name;
 			string declTypeName = analyzedMethod.DeclaringType.FullName;
-			foreach (TypeDefinition type in TreeTraversal.PreOrder(asm.AssemblyDefinition.MainModule.Types, t => t.NestedTypes))
-			{
+			foreach (TypeDefinition type in TreeTraversal.PreOrder(asm.AssemblyDefinition.MainModule.Types, t => t.NestedTypes)) {
 				ct.ThrowIfCancellationRequested();
 				SharpTreeNode newNode = null;
 				try {
@@ -91,6 +90,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 				catch (ReferenceResolvingException) {
 					// ignore this type definition. maybe add a notification about such cases.
 				}
+
 				if (newNode != null)
 					yield return newNode;
 			}
@@ -98,7 +98,10 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 
 		public static bool CanShow(MethodDefinition method)
 		{
-			return method.IsVirtual && !method.IsFinal && !method.DeclaringType.IsSealed && !method.DeclaringType.IsInterface;	// interfaces are temporarly disabled
+			return method.IsVirtual &&
+				!method.IsFinal &&
+				!method.DeclaringType.IsSealed &&
+				!method.DeclaringType.IsInterface;	// interface methods are definitions not implementations - cannot be overridden
 		}
 	}
 }

ILSpy/TreeNodes/Analyzer/AnalyzedMethodTreeNode.cs

@@ -21,10 +21,10 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedMethodTreeNode : AnalyzerTreeNode, IMemberTreeNode
+	internal class AnalyzedMethodTreeNode : AnalyzerTreeNode, IMemberTreeNode
 	{
-		MethodDefinition analyzedMethod;
-		string prefix;
+		private readonly MethodDefinition analyzedMethod;
+		private readonly string prefix;
 
 		public AnalyzedMethodTreeNode(MethodDefinition analyzedMethod, string prefix = "")
 		{
@@ -57,7 +57,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		protected override void LoadChildren()
 		{
 			if (analyzedMethod.HasBody)
-				this.Children.Add(new AnalyzedMethodUsesNode(analyzedMethod));
+				this.Children.Add(new AnalyzedMethodUsesTreeNode(analyzedMethod));
 			this.Children.Add(new AnalyzedMethodUsedByTreeNode(analyzedMethod));
 			if (AnalyzedMethodOverridesTreeNode.CanShow(analyzedMethod))
 				this.Children.Add(new AnalyzedMethodOverridesTreeNode(analyzedMethod));

ILSpy/TreeNodes/Analyzer/AnalyzedMethodUsedByTreeNode.cs

@@ -25,10 +25,10 @@ using Mono.Cecil.Cil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedMethodUsedByTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedMethodUsedByTreeNode : AnalyzerTreeNode
 	{
-		MethodDefinition analyzedMethod;
-		ThreadingSupport threading;
+		private readonly MethodDefinition analyzedMethod;
+		private readonly ThreadingSupport threading;
 
 		public AnalyzedMethodUsedByTreeNode(MethodDefinition analyzedMethod)
 		{
@@ -64,7 +64,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			ScopedWhereUsedScopeAnalyzer<SharpTreeNode> analyzer;
 
@@ -72,7 +72,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			return analyzer.PerformAnalysis(ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
+		private IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
 		{
 			string name = analyzedMethod.Name;
 			foreach (MethodDefinition method in type.Methods) {
@@ -81,13 +81,15 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 					continue;
 				foreach (Instruction instr in method.Body.Instructions) {
 					MethodReference mr = instr.Operand as MethodReference;
-					if (mr != null && mr.Name == name && Helpers.IsReferencedBy(analyzedMethod.DeclaringType, mr.DeclaringType) && mr.Resolve() == analyzedMethod) {
+					if (mr != null &&
+						mr.Name == name &&
+						Helpers.IsReferencedBy(analyzedMethod.DeclaringType, mr.DeclaringType) &&
+						mr.Resolve() == analyzedMethod) {
 						found = true;
 						break;
 					}
 				}
 
-
 				method.Body = null;
 
 				if (found)

ILSpy/TreeNodes/Analyzer/AnalyzedMethodUsesTreeNode.cs

@@ -27,11 +27,11 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 	/// <summary>
 	/// Shows the methods that are used by this method.
 	/// </summary>
-	sealed class AnalyzedMethodUsesNode : AnalyzerTreeNode
+	internal sealed class AnalyzedMethodUsesTreeNode : AnalyzerTreeNode
 	{
-		MethodDefinition analyzedMethod;
+		private readonly MethodDefinition analyzedMethod;
 
-		public AnalyzedMethodUsesNode(MethodDefinition analyzedMethod)
+		public AnalyzedMethodUsesTreeNode(MethodDefinition analyzedMethod)
 		{
 			if (analyzedMethod == null)
 				throw new ArgumentNullException("analyzedMethod");
@@ -53,7 +53,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		protected override void LoadChildren()
 		{
 			foreach (var f in GetUsedFields().Distinct()) {
-				this.Children.Add(new AnalyzedFieldNode(f));
+				this.Children.Add(new AnalyzedFieldTreeNode(f));
 			}
 			foreach (var m in GetUsedMethods().Distinct()) {
 				this.Children.Add(new AnalyzedMethodTreeNode(m));
@@ -61,7 +61,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			analyzedMethod.Body = null;
 		}
 
-		IEnumerable<MethodDefinition> GetUsedMethods()
+		private IEnumerable<MethodDefinition> GetUsedMethods()
 		{
 			foreach (Instruction instr in analyzedMethod.Body.Instructions) {
 				MethodReference mr = instr.Operand as MethodReference;
@@ -73,7 +73,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<FieldDefinition> GetUsedFields()
+		private IEnumerable<FieldDefinition> GetUsedFields()
 		{
 			foreach (Instruction instr in analyzedMethod.Body.Instructions) {
 				FieldReference fr = instr.Operand as FieldReference;

ILSpy/TreeNodes/Analyzer/AnalyzedPropertyAccessorsTreeNode.cs

@@ -21,15 +21,12 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	public class AnalyzedPropertyAccessorsTreeNode : AnalyzerTreeNode
+	public sealed class AnalyzedPropertyAccessorsTreeNode : AnalyzerTreeNode
 	{
-		PropertyDefinition analyzedProperty;
-
 		public AnalyzedPropertyAccessorsTreeNode(PropertyDefinition analyzedProperty)
 		{
 			if (analyzedProperty == null)
 				throw new ArgumentNullException("analyzedProperty");
-			this.analyzedProperty = analyzedProperty;
 
 			if (analyzedProperty.GetMethod != null)
 				this.Children.Add(new AnalyzedPropertyAccessorTreeNode(analyzedProperty.GetMethod, "get"));
@@ -54,9 +51,9 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			return !MainWindow.Instance.CurrentLanguage.ShowMember(property.GetMethod ?? property.SetMethod);
 		}
 
-		class AnalyzedPropertyAccessorTreeNode : AnalyzedMethodTreeNode
+		private class AnalyzedPropertyAccessorTreeNode : AnalyzedMethodTreeNode
 		{
-			string name;
+			private readonly string name;
 
 			public AnalyzedPropertyAccessorTreeNode(MethodDefinition analyzedMethod, string name)
 				: base(analyzedMethod)

ILSpy/TreeNodes/Analyzer/AnalyzedPropertyOverridesTreeNode.cs

@@ -28,10 +28,10 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedPropertyOverridesTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedPropertyOverridesTreeNode : AnalyzerTreeNode
 	{
-		readonly PropertyDefinition analyzedProperty;
-		readonly ThreadingSupport threading;
+		private readonly PropertyDefinition analyzedProperty;
+		private readonly ThreadingSupport threading;
 
 		public AnalyzedPropertyOverridesTreeNode(PropertyDefinition analyzedProperty)
 		{
@@ -67,19 +67,20 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			return FindReferences(MainWindow.Instance.CurrentAssemblyList.GetAssemblies(), ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferences(IEnumerable<LoadedAssembly> assemblies, CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FindReferences(IEnumerable<LoadedAssembly> assemblies, CancellationToken ct)
 		{
 			assemblies = assemblies.Where(asm => asm.AssemblyDefinition != null);
+
 			// use parallelism only on the assembly level (avoid locks within Cecil)
 			return assemblies.AsParallel().WithCancellation(ct).SelectMany((LoadedAssembly asm) => FindReferences(asm, ct));
 		}
 
-		IEnumerable<SharpTreeNode> FindReferences(LoadedAssembly asm, CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FindReferences(LoadedAssembly asm, CancellationToken ct)
 		{
 			string asmName = asm.AssemblyDefinition.Name.Name;
 			string name = analyzedProperty.Name;

ILSpy/TreeNodes/Analyzer/AnalyzedPropertyTreeNode.cs

@@ -22,16 +22,16 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedPropertyTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedPropertyTreeNode : AnalyzerTreeNode
 	{
-		PropertyDefinition analyzedProperty;
-		bool isIndexer;
-		string prefix;
+		private readonly PropertyDefinition analyzedProperty;
+		private readonly bool isIndexer;
+		private readonly string prefix;
 
 		public AnalyzedPropertyTreeNode(PropertyDefinition analyzedProperty, string prefix = "")
 		{
 			if (analyzedProperty == null)
-				throw new ArgumentNullException("analyzedMethod");
+				throw new ArgumentNullException("analyzedProperty");
 			this.isIndexer = analyzedProperty.IsIndexer();
 			this.analyzedProperty = analyzedProperty;
 			this.prefix = prefix;

ILSpy/TreeNodes/Analyzer/AnalyzedTypeExposedByTreeNode.cs

@@ -24,11 +24,10 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedTypeExposedByTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedTypeExposedByTreeNode : AnalyzerTreeNode
 	{
-		TypeDefinition analyzedType;
-		ThreadingSupport threading;
-		bool IsSystemObject;
+		private readonly TypeDefinition analyzedType;
+		private readonly ThreadingSupport threading;
 
 		public AnalyzedTypeExposedByTreeNode(TypeDefinition analyzedType)
 		{
@@ -38,8 +37,6 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			this.analyzedType = analyzedType;
 			this.threading = new ThreadingSupport();
 			this.LazyLoading = true;
-
-			this.IsSystemObject = (analyzedType.FullName == "System.Object");
 		}
 
 		public override object Text
@@ -66,7 +63,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			ScopedWhereUsedScopeAnalyzer<SharpTreeNode> analyzer;
 
@@ -74,7 +71,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			return analyzer.PerformAnalysis(ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
+		private IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
 		{
 			if (analyzedType.IsEnum && type == analyzedType)
 				yield break;
@@ -84,7 +81,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 
 			foreach (FieldDefinition field in type.Fields) {
 				if (TypeIsExposedBy(field))
-					yield return new AnalyzedFieldNode(field);
+					yield return new AnalyzedFieldTreeNode(field);
 			}
 
 			foreach (PropertyDefinition property in type.Properties) {
@@ -165,14 +162,14 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			return false;
 		}
 
-		private bool IsPrivate(PropertyDefinition property)
+		private static bool IsPrivate(PropertyDefinition property)
 		{
 			bool isGetterPublic = (property.GetMethod != null && !property.GetMethod.IsPrivate);
 			bool isSetterPublic = (property.SetMethod != null && !property.SetMethod.IsPrivate);
 			return !(isGetterPublic || isSetterPublic);
 		}
 
-		private bool IsPrivate(EventDefinition eventDef)
+		private static bool IsPrivate(EventDefinition eventDef)
 		{
 			bool isAdderPublic = (eventDef.AddMethod != null && !eventDef.AddMethod.IsPrivate);
 			bool isRemoverPublic = (eventDef.RemoveMethod != null && !eventDef.RemoveMethod.IsPrivate);
@@ -183,6 +180,5 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 		{
 			return true;
 		}
-
 	}
 }

ILSpy/TreeNodes/Analyzer/AnalyzedTypeExtensionMethodsTreeNode.cs

@@ -25,11 +25,10 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedTypeExtensionMethodsTreeNode : AnalyzerTreeNode
+	internal class AnalyzedTypeExtensionMethodsTreeNode : AnalyzerTreeNode
 	{
-		TypeDefinition analyzedType;
-		ThreadingSupport threading;
-		bool IsSystemObject;
+		private readonly TypeDefinition analyzedType;
+		private readonly ThreadingSupport threading;
 
 		public AnalyzedTypeExtensionMethodsTreeNode(TypeDefinition analyzedType)
 		{
@@ -39,8 +38,6 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			this.analyzedType = analyzedType;
 			this.threading = new ThreadingSupport();
 			this.LazyLoading = true;
-
-			this.IsSystemObject = (analyzedType.FullName == "System.Object");
 		}
 
 		public override object Text
@@ -67,7 +64,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			ScopedWhereUsedScopeAnalyzer<SharpTreeNode> analyzer;
 
@@ -75,7 +72,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			return analyzer.PerformAnalysis(ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
+		private IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
 		{
 			foreach (MethodDefinition method in type.Methods) {
 				if (method.IsStatic && method.HasCustomAttributes) {
@@ -88,32 +85,9 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		private bool TypeIsExposedBy(MethodDefinition method)
-		{
-			if (method.IsPrivate)
-				return false;
-
-			// exclude methods with 'semantics'. for example, property getters & setters.
-			if (method.SemanticsAttributes != MethodSemanticsAttributes.None)
-				return false;
-
-			if (method.ReturnType.Resolve() == analyzedType)
-				return true;
-
-			if (method.HasParameters) {
-				foreach (var parameter in method.Parameters) {
-					if (parameter.ParameterType.Resolve() == analyzedType)
-						return true;
-				}
-			}
-
-			return false;
-		}
-
 		public static bool CanShow(TypeDefinition type)
 		{
 			return !(type.IsEnum);
 		}
-
 	}
 }

ILSpy/TreeNodes/Analyzer/AnalyzedTypeInstantiationsTreeNode.cs

@@ -27,11 +27,11 @@ using Mono.Cecil.Cil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedTypeInstantiationsTreeNode : AnalyzerTreeNode
+	internal sealed class AnalyzedTypeInstantiationsTreeNode : AnalyzerTreeNode
 	{
-		TypeDefinition analyzedType;
-		ThreadingSupport threading;
-		bool IsSystemObject;
+		private readonly TypeDefinition analyzedType;
+		private readonly ThreadingSupport threading;
+		private readonly bool isSystemObject;
 
 		public AnalyzedTypeInstantiationsTreeNode(TypeDefinition analyzedType)
 		{
@@ -42,7 +42,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			this.threading = new ThreadingSupport();
 			this.LazyLoading = true;
 
-			this.IsSystemObject = (analyzedType.FullName == "System.Object");
+			this.isSystemObject = (analyzedType.FullName == "System.Object");
 		}
 
 		public override object Text
@@ -69,7 +69,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
+		private IEnumerable<SharpTreeNode> FetchChildren(CancellationToken ct)
 		{
 			ScopedWhereUsedScopeAnalyzer<SharpTreeNode> analyzer;
 
@@ -77,7 +77,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			return analyzer.PerformAnalysis(ct);
 		}
 
-		IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
+		private IEnumerable<SharpTreeNode> FindReferencesInType(TypeDefinition type)
 		{
 			foreach (MethodDefinition method in type.Methods) {
 				bool found = false;
@@ -87,7 +87,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 				// ignore chained constructors
 				// (since object is the root of everything, we can short circuit the test in this case)
 				if (method.Name == ".ctor" &&
-					(IsSystemObject || analyzedType == type || TypesHierarchyHelpers.IsBaseType(analyzedType, type, false)))
+					(isSystemObject || analyzedType == type || TypesHierarchyHelpers.IsBaseType(analyzedType, type, false)))
 					continue;
 
 				foreach (Instruction instr in method.Body.Instructions) {
@@ -114,6 +114,5 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 			return false;
 		}
-
 	}
 }

ILSpy/TreeNodes/Analyzer/AnalyzedTypeTreeNode.cs

@@ -21,9 +21,9 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	class AnalyzedTypeTreeNode : AnalyzerTreeNode, IMemberTreeNode
+	internal class AnalyzedTypeTreeNode : AnalyzerTreeNode, IMemberTreeNode
 	{
-		TypeDefinition analyzedType;
+		private readonly TypeDefinition analyzedType;
 
 		public AnalyzedTypeTreeNode(TypeDefinition analyzedType)
 		{

ILSpy/TreeNodes/Analyzer/AnalyzerTreeNode.cs

@@ -24,7 +24,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
 	public class AnalyzerTreeNode : SharpTreeNode
 	{
-		Language language;
+		private Language language;
 
 		public Language Language
 		{

ILSpy/TreeNodes/Analyzer/Helpers.cs

@@ -24,7 +24,7 @@ using Mono.Cecil;
 
 namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 {
-	static class Helpers
+	internal static class Helpers
 	{
 		public static bool IsReferencedBy(TypeDefinition type, TypeReference typeRef)
 		{

ILSpy/TreeNodes/Analyzer/ScopedWhereUsedAnalyzer.cs

@@ -108,7 +108,6 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 				return FindReferencesInTypeScope(ct);
 			}
 
-
 			if (memberAccessibility == Accessibility.Internal ||
 				memberAccessibility == Accessibility.FamilyAndInternal ||
 				typeAccessibility == Accessibility.Internal ||
@@ -136,7 +135,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		private Accessibility GetNestedTypeAccessibility(TypeDefinition type)
+		private static Accessibility GetNestedTypeAccessibility(TypeDefinition type)
 		{
 			Accessibility result;
 			switch (type.Attributes & TypeAttributes.VisibilityMask) {
@@ -177,22 +176,23 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			Public
 		}
 
-
-		IEnumerable<T> FindReferencesInAssemblyAndFriends(CancellationToken ct)
+		private IEnumerable<T> FindReferencesInAssemblyAndFriends(CancellationToken ct)
 		{
 			var assemblies = GetAssemblyAndAnyFriends(assemblyScope, ct);
+
 			// use parallelism only on the assembly level (avoid locks within Cecil)
 			return assemblies.AsParallel().WithCancellation(ct).SelectMany((AssemblyDefinition a) => FindReferencesInAssembly(a, ct));
 		}
 
-		IEnumerable<T> FindReferencesGlobal(CancellationToken ct)
+		private IEnumerable<T> FindReferencesGlobal(CancellationToken ct)
 		{
 			var assemblies = GetReferencingAssemblies(assemblyScope, ct);
+
 			// use parallelism only on the assembly level (avoid locks within Cecil)
 			return assemblies.AsParallel().WithCancellation(ct).SelectMany((AssemblyDefinition asm) => FindReferencesInAssembly(asm, ct));
 		}
 
-		IEnumerable<T> FindReferencesInAssembly(AssemblyDefinition asm, CancellationToken ct)
+		private IEnumerable<T> FindReferencesInAssembly(AssemblyDefinition asm, CancellationToken ct)
 		{
 			foreach (TypeDefinition type in TreeTraversal.PreOrder(asm.MainModule.Types, t => t.NestedTypes)) {
 				ct.ThrowIfCancellationRequested();
@@ -203,7 +203,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<T> FindReferencesInTypeScope(CancellationToken ct)
+		private IEnumerable<T> FindReferencesInTypeScope(CancellationToken ct)
 		{
 			foreach (TypeDefinition type in TreeTraversal.PreOrder(typeScope, t => t.NestedTypes)) {
 				ct.ThrowIfCancellationRequested();
@@ -214,7 +214,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<AssemblyDefinition> GetReferencingAssemblies(AssemblyDefinition asm, CancellationToken ct)
+		private IEnumerable<AssemblyDefinition> GetReferencingAssemblies(AssemblyDefinition asm, CancellationToken ct)
 		{
 			yield return asm;
 
@@ -236,7 +236,7 @@ namespace ICSharpCode.ILSpy.TreeNodes.Analyzer
 			}
 		}
 
-		IEnumerable<AssemblyDefinition> GetAssemblyAndAnyFriends(AssemblyDefinition asm, CancellationToken ct)
+		private IEnumerable<AssemblyDefinition> GetAssemblyAndAnyFriends(AssemblyDefinition asm, CancellationToken ct)
 		{
 			yield return asm;
 

ILSpy/TreeNodes/AssemblyTreeNode.cs

@@ -41,35 +41,39 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	public sealed class AssemblyTreeNode : ILSpyTreeNode
 	{
 		readonly LoadedAssembly assembly;
-		readonly List<TypeTreeNode> classes = new List<TypeTreeNode>();
 		readonly Dictionary<string, NamespaceTreeNode> namespaces = new Dictionary<string, NamespaceTreeNode>();
-		
+
 		public AssemblyTreeNode(LoadedAssembly assembly)
 		{
 			if (assembly == null)
 				throw new ArgumentNullException("assembly");
-			
+
 			this.assembly = assembly;
-			
+
 			assembly.ContinueWhenLoaded(OnAssemblyLoaded, TaskScheduler.FromCurrentSynchronizationContext());
-			
+
 			this.LazyLoading = true;
 		}
-		
-		public AssemblyList AssemblyList {
+
+		public AssemblyList AssemblyList
+		{
 			get { return assembly.AssemblyList; }
 		}
-		
-		public LoadedAssembly LoadedAssembly {
+
+		public LoadedAssembly LoadedAssembly
+		{
 			get { return assembly; }
 		}
-		
-		public override object Text {
+
+		public override object Text
+		{
 			get { return HighlightSearchMatch(assembly.ShortName); }
 		}
-		
-		public override object Icon {
-			get {
+
+		public override object Icon
+		{
+			get
+			{
 				if (assembly.IsLoaded) {
 					return assembly.HasLoadError ? Images.AssemblyWarning : Images.Assembly;
 				} else {
@@ -77,11 +81,12 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				}
 			}
 		}
-		
-		public override bool ShowExpander {
+
+		public override bool ShowExpander
+		{
 			get { return !assembly.HasLoadError; }
 		}
-		
+
 		void OnAssemblyLoaded(Task<AssemblyDefinition> assemblyTask)
 		{
 			// change from "Loading" icon to final icon
@@ -90,14 +95,15 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			if (assemblyTask.IsFaulted) {
 				RaisePropertyChanged("ShowExpander"); // cannot expand assemblies with load error
 				// observe the exception so that the Task's finalizer doesn't re-throw it
-				try { assemblyTask.Wait(); } catch (AggregateException) {}
+				try { assemblyTask.Wait(); }
+				catch (AggregateException) { }
 			} else {
 				RaisePropertyChanged("Text"); // shortname might have changed
 			}
 		}
-		
+
 		Dictionary<TypeDefinition, TypeTreeNode> typeDict = new Dictionary<TypeDefinition, TypeTreeNode>();
-		
+
 		protected override void LoadChildren()
 		{
 			AssemblyDefinition assemblyDefinition = assembly.AssemblyDefinition;
@@ -106,7 +112,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				return;
 			}
 			ModuleDefinition mainModule = assemblyDefinition.MainModule;
-			
+
 			this.Children.Add(new ReferenceFolderTreeNode(mainModule, this));
 			if (mainModule.HasResources)
 				this.Children.Add(new ResourceListTreeNode(mainModule));
@@ -128,7 +134,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 					this.Children.Add(ns);
 			}
 		}
-		
+
 		public TypeTreeNode FindTypeNode(TypeDefinition def)
 		{
 			if (def == null)
@@ -140,41 +146,41 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			else
 				return null;
 		}
-		
+
 		public override bool CanDrag(SharpTreeNode[] nodes)
 		{
 			return nodes.All(n => n is AssemblyTreeNode);
 		}
-		
+
 		public override void StartDrag(DependencyObject dragSource, SharpTreeNode[] nodes)
 		{
 			DragDrop.DoDragDrop(dragSource, Copy(nodes), DragDropEffects.All);
 		}
-		
+
 		public override bool CanDelete()
 		{
 			return true;
 		}
-		
+
 		public override void Delete()
 		{
 			DeleteCore();
 		}
-		
+
 		public override void DeleteCore()
 		{
 			assembly.AssemblyList.Unload(assembly);
 		}
-		
+
 		internal const string DataFormat = "ILSpyAssemblies";
-		
+
 		public override IDataObject Copy(SharpTreeNode[] nodes)
 		{
 			DataObject dataObject = new DataObject();
 			dataObject.SetData(DataFormat, nodes.OfType<AssemblyTreeNode>().Select(n => n.LoadedAssembly.FileName).ToArray());
 			return dataObject;
 		}
-		
+
 		public override FilterResult Filter(FilterSettings settings)
 		{
 			if (settings.SearchTermMatches(assembly.ShortName))
@@ -182,13 +188,13 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			else
 				return FilterResult.Recurse;
 		}
-		
+
 		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 		{
 			assembly.WaitUntilLoaded(); // necessary so that load errors are passed on to the caller
 			language.DecompileAssembly(assembly, output, options);
 		}
-		
+
 		public override bool Save(DecompilerTextView textView)
 		{
 			Language language = this.Language;
@@ -215,12 +221,12 @@ namespace ICSharpCode.ILSpy.TreeNodes
 						}
 					}
 				}
-				textView.SaveToDisk(language, new[]{this}, options, dlg.FileName);
+				textView.SaveToDisk(language, new[] { this }, options, dlg.FileName);
 			}
 			return true;
 		}
 	}
-	
+
 	[ExportContextMenuEntry(Header = "_Remove", Icon = "images/Delete.png")]
 	sealed class RemoveAssembly : IContextMenuEntry
 	{
@@ -228,12 +234,12 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		{
 			return selectedNodes.All(n => n is AssemblyTreeNode);
 		}
-		
+
 		public bool IsEnabled(SharpTreeNode[] selectedNodes)
 		{
 			return true;
 		}
-		
+
 		public void Execute(SharpTreeNode[] selectedNodes)
 		{
 			foreach (var node in selectedNodes) {

ILSpy/TreeNodes/ResourceEntryNode.cs

@@ -22,17 +22,25 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	/// </summary>
 	public class ResourceEntryNode : ILSpyTreeNode
 	{
-		protected readonly string key;
-		protected readonly Stream data;
-		
-		public override object Text {
+		private readonly string key;
+		private readonly Stream data;
+
+		public override object Text
+		{
 			get { return key.ToString(); }
 		}
-		
-		public override object Icon {
+
+		public override object Icon
+		{
 			get { return Images.Resource; }
 		}
-		
+
+		protected Stream Data
+		{
+			get { return data; }
+		}
+
+
 		public ResourceEntryNode(string key, Stream data)
 		{
 			if (key == null)
@@ -42,7 +50,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			this.key = key;
 			this.data = data;
 		}
-		
+
 		public static ILSpyTreeNode Create(string key, Stream data)
 		{
 			ILSpyTreeNode result = null;
@@ -53,12 +61,12 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			}
 			return result ?? new ResourceEntryNode(key, data);
 		}
-		
+
 		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 		{
 			language.WriteCommentLine(output, string.Format("{0} = {1}", key, data));
 		}
-		
+
 		public override bool Save(DecompilerTextView textView)
 		{
 			SaveFileDialog dlg = new SaveFileDialog();
@@ -72,12 +80,12 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			return true;
 		}
 	}
-	
+
 	[Export(typeof(IResourceNodeFactory))]
 	sealed class ImageResourceNodeFactory : IResourceNodeFactory
 	{
 		static readonly string[] imageFileExtensions = { ".png", ".gif", ".bmp", ".jpg", ".ico" };
-		
+
 		public ILSpyTreeNode CreateNode(Mono.Cecil.Resource resource)
 		{
 			EmbeddedResource er = resource as EmbeddedResource;
@@ -86,7 +94,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			}
 			return null;
 		}
-		
+
 		public ILSpyTreeNode CreateNode(string key, Stream data)
 		{
 			foreach (string fileExt in imageFileExtensions) {
@@ -96,10 +104,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			return null;
 		}
 	}
-	
+
 	sealed class ImageResourceEntryNode : ResourceEntryNode
 	{
-		public ImageResourceEntryNode(string key, Stream data) : base(key, data)
+		public ImageResourceEntryNode(string key, Stream data)
+			: base(key, data)
 		{
 		}
 
@@ -112,17 +121,18 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		{
 			try {
 				AvalonEditTextOutput output = new AvalonEditTextOutput();
-				data.Position = 0;
+				Data.Position = 0;
 				BitmapImage image = new BitmapImage();
 				image.BeginInit();
-				image.StreamSource = data;
+				image.StreamSource = Data;
 				image.EndInit();
 				output.AddUIElement(() => new Image { Source = image });
 				output.WriteLine();
 				output.AddButton(Images.Save, "Save", delegate { Save(null); });
 				textView.Show(output, null);
 				return true;
-			} catch (Exception) {
+			}
+			catch (Exception) {
 				return false;
 			}
 		}

ILSpy/TreeNodes/XamlResourceNode.cs

@@ -48,7 +48,7 @@ namespace ICSharpCode.ILSpy.Xaml
 						try {
 							// cache read XAML because stream will be closed after first read
 							if (xaml == null) {
-								using (var reader = new StreamReader(data)) {
+								using (var reader = new StreamReader(Data)) {
 									xaml = reader.ReadToEnd();
 								}
 							}