From 507ae707cbfbc668f39637ecaa9832c40183eba9 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 6 Feb 2011 02:20:11 +0100 Subject: [PATCH] Move TreeNodes to their own namespace. --- ILSpy/AssemblyList.cs | 2 ++ ILSpy/MainWindow.xaml.cs | 2 ++ ILSpy/SessionSettings.cs | 2 +- ILSpy/TextView/DecompilerTextView.cs | 1 + ILSpy/TreeNodes/AssemblyListTreeNode.cs | 2 +- ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs | 4 ++-- ILSpy/TreeNodes/AssemblyTreeNode.cs | 8 ++++++-- ILSpy/TreeNodes/BaseTypesTreeNode.cs | 2 +- ILSpy/TreeNodes/EventTreeNode.cs | 2 +- ILSpy/TreeNodes/FieldTreeNode.cs | 4 ++-- ILSpy/TreeNodes/ILSpyTreeNode.cs | 9 +++++---- ILSpy/TreeNodes/MethodTreeNode.cs | 4 ++-- ILSpy/TreeNodes/ModuleReferenceTreeNode.cs | 4 ++-- ILSpy/TreeNodes/NamespaceTreeNode.cs | 5 ++++- ILSpy/TreeNodes/PropertyTreeNode.cs | 2 +- ILSpy/TreeNodes/ReferenceFolderTreeNode.cs | 4 ++-- ILSpy/TreeNodes/ResourceListTreeNode.cs | 6 +++--- ILSpy/TreeNodes/TypeTreeNode.cs | 4 ++-- 18 files changed, 40 insertions(+), 27 deletions(-) diff --git a/ILSpy/AssemblyList.cs b/ILSpy/AssemblyList.cs index f841a95e3..83bc06c1c 100644 --- a/ILSpy/AssemblyList.cs +++ b/ILSpy/AssemblyList.cs @@ -22,6 +22,8 @@ using System.Collections.ObjectModel; using System.IO; using System.Linq; using System.Xml.Linq; + +using ICSharpCode.ILSpy.TreeNodes; using Mono.Cecil; namespace ICSharpCode.ILSpy diff --git a/ILSpy/MainWindow.xaml.cs b/ILSpy/MainWindow.xaml.cs index a48aebd41..74dae1621 100644 --- a/ILSpy/MainWindow.xaml.cs +++ b/ILSpy/MainWindow.xaml.cs @@ -25,8 +25,10 @@ using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Input; + using ICSharpCode.Decompiler; using ICSharpCode.Decompiler.FlowAnalysis; +using ICSharpCode.ILSpy.TreeNodes; using ICSharpCode.TreeView; using Microsoft.Win32; using Mono.Cecil.Rocks; diff --git a/ILSpy/SessionSettings.cs b/ILSpy/SessionSettings.cs index de9716038..3ae0d3cc2 100644 --- a/ILSpy/SessionSettings.cs +++ b/ILSpy/SessionSettings.cs @@ -58,7 +58,7 @@ namespace ICSharpCode.ILSpy PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } - public readonly FilterSettings FilterSettings; + public FilterSettings FilterSettings { get; private set; } public string[] ActiveTreeViewPath; diff --git a/ILSpy/TextView/DecompilerTextView.cs b/ILSpy/TextView/DecompilerTextView.cs index dd3fe6f3c..8fdff7138 100644 --- a/ILSpy/TextView/DecompilerTextView.cs +++ b/ILSpy/TextView/DecompilerTextView.cs @@ -31,6 +31,7 @@ using System.Xml; using ICSharpCode.AvalonEdit.Folding; using ICSharpCode.AvalonEdit.Highlighting; using ICSharpCode.AvalonEdit.Highlighting.Xshd; +using ICSharpCode.ILSpy.TreeNodes; using Mono.Cecil; namespace ICSharpCode.ILSpy.TextView diff --git a/ILSpy/TreeNodes/AssemblyListTreeNode.cs b/ILSpy/TreeNodes/AssemblyListTreeNode.cs index 5cba82843..4e83f93d0 100644 --- a/ILSpy/TreeNodes/AssemblyListTreeNode.cs +++ b/ILSpy/TreeNodes/AssemblyListTreeNode.cs @@ -22,7 +22,7 @@ using System.Windows; using ICSharpCode.TreeView; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { /// /// Represents a list of assemblies. diff --git a/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs b/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs index 1dba62b37..6066af61d 100644 --- a/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs +++ b/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs @@ -21,12 +21,12 @@ using System.Linq; using ICSharpCode.TreeView; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { /// /// Node within assembly reference list. /// - sealed class AssemblyReferenceTreeNode : ILSpyTreeNode + sealed class AssemblyReferenceTreeNode : ILSpyTreeNode { readonly AssemblyNameReference r; readonly AssemblyTreeNode parentAssembly; diff --git a/ILSpy/TreeNodes/AssemblyTreeNode.cs b/ILSpy/TreeNodes/AssemblyTreeNode.cs index 4afd3259d..8a248935d 100644 --- a/ILSpy/TreeNodes/AssemblyTreeNode.cs +++ b/ILSpy/TreeNodes/AssemblyTreeNode.cs @@ -29,9 +29,13 @@ using ICSharpCode.Decompiler; using ICSharpCode.TreeView; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { - sealed class AssemblyTreeNode : ILSpyTreeNode + /// + /// Tree node representing an assembly. + /// This class is responsible for loading both namespace and type nodes. + /// + sealed class AssemblyTreeNode : ILSpyTreeNode { readonly AssemblyList assemblyList; readonly string fileName; diff --git a/ILSpy/TreeNodes/BaseTypesTreeNode.cs b/ILSpy/TreeNodes/BaseTypesTreeNode.cs index 073f435bf..d97f2d7c6 100644 --- a/ILSpy/TreeNodes/BaseTypesTreeNode.cs +++ b/ILSpy/TreeNodes/BaseTypesTreeNode.cs @@ -22,7 +22,7 @@ using System.Linq; using ICSharpCode.TreeView; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { /// /// Lists the base types of a class. diff --git a/ILSpy/TreeNodes/EventTreeNode.cs b/ILSpy/TreeNodes/EventTreeNode.cs index 1054d5cde..0a8760ca8 100644 --- a/ILSpy/TreeNodes/EventTreeNode.cs +++ b/ILSpy/TreeNodes/EventTreeNode.cs @@ -20,7 +20,7 @@ using System; using ICSharpCode.Decompiler; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { /// /// Represents an event in the TreeView. diff --git a/ILSpy/TreeNodes/FieldTreeNode.cs b/ILSpy/TreeNodes/FieldTreeNode.cs index e109d63db..5aa8b4c75 100644 --- a/ILSpy/TreeNodes/FieldTreeNode.cs +++ b/ILSpy/TreeNodes/FieldTreeNode.cs @@ -20,12 +20,12 @@ using System; using ICSharpCode.Decompiler; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { /// /// Represents a field in the TreeView. /// - sealed class FieldTreeNode : ILSpyTreeNode + sealed class FieldTreeNode : ILSpyTreeNode { readonly FieldDefinition field; diff --git a/ILSpy/TreeNodes/ILSpyTreeNode.cs b/ILSpy/TreeNodes/ILSpyTreeNode.cs index b0960e592..4514f44f6 100644 --- a/ILSpy/TreeNodes/ILSpyTreeNode.cs +++ b/ILSpy/TreeNodes/ILSpyTreeNode.cs @@ -24,8 +24,11 @@ using System.ComponentModel; using ICSharpCode.Decompiler; using ICSharpCode.TreeView; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { + /// + /// Base class of all ILSpy tree nodes. + /// abstract class ILSpyTreeNodeBase : SharpTreeNode { FilterSettings filterSettings; @@ -63,7 +66,7 @@ namespace ICSharpCode.ILSpy } } - public enum FilterResult + enum FilterResult { /// /// Hides the node. @@ -200,6 +203,4 @@ namespace ICSharpCode.ILSpy get { return allChildren; } } } - - class ILSpyTreeNode : ILSpyTreeNode {} } diff --git a/ILSpy/TreeNodes/MethodTreeNode.cs b/ILSpy/TreeNodes/MethodTreeNode.cs index 92a4f891a..d5e0ab421 100644 --- a/ILSpy/TreeNodes/MethodTreeNode.cs +++ b/ILSpy/TreeNodes/MethodTreeNode.cs @@ -21,12 +21,12 @@ using System.Text; using ICSharpCode.Decompiler; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { /// /// Tree Node representing a field, method, property, or event. /// - sealed class MethodTreeNode : ILSpyTreeNode + sealed class MethodTreeNode : ILSpyTreeNode { MethodDefinition method; diff --git a/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs b/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs index 6e7e7ef9e..8732b4b84 100644 --- a/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs +++ b/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs @@ -20,12 +20,12 @@ using System; using ICSharpCode.TreeView; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { /// /// Module reference in ReferenceFolderTreeNode. /// - sealed class ModuleReferenceTreeNode : ILSpyTreeNode + sealed class ModuleReferenceTreeNode : ILSpyTreeNode { ModuleReference r; diff --git a/ILSpy/TreeNodes/NamespaceTreeNode.cs b/ILSpy/TreeNodes/NamespaceTreeNode.cs index e28441176..64006a0a9 100644 --- a/ILSpy/TreeNodes/NamespaceTreeNode.cs +++ b/ILSpy/TreeNodes/NamespaceTreeNode.cs @@ -20,8 +20,11 @@ using System; using System.Linq; using ICSharpCode.Decompiler; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { + /// + /// Namespace node. The loading of the type nodes is handled by the parent AssemblyTreeNode. + /// sealed class NamespaceTreeNode : ILSpyTreeNode { string name; diff --git a/ILSpy/TreeNodes/PropertyTreeNode.cs b/ILSpy/TreeNodes/PropertyTreeNode.cs index 068f52f08..ac9483044 100644 --- a/ILSpy/TreeNodes/PropertyTreeNode.cs +++ b/ILSpy/TreeNodes/PropertyTreeNode.cs @@ -20,7 +20,7 @@ using System; using ICSharpCode.Decompiler; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { /// /// Represents a property in the TreeView. diff --git a/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs b/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs index b444c469e..2af0d5117 100644 --- a/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs +++ b/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs @@ -20,12 +20,12 @@ using System; using ICSharpCode.TreeView; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { /// /// References folder. /// - sealed class ReferenceFolderTreeNode : ILSpyTreeNode + sealed class ReferenceFolderTreeNode : ILSpyTreeNode { readonly ModuleDefinition module; readonly AssemblyTreeNode parentAssembly; diff --git a/ILSpy/TreeNodes/ResourceListTreeNode.cs b/ILSpy/TreeNodes/ResourceListTreeNode.cs index 02457b979..bba03e0cd 100644 --- a/ILSpy/TreeNodes/ResourceListTreeNode.cs +++ b/ILSpy/TreeNodes/ResourceListTreeNode.cs @@ -4,10 +4,10 @@ using System; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { /// - /// Description of ResourcesTreeNode. + /// Lists the embedded resources in an assembly. /// class ResourceListTreeNode : ILSpyTreeNode { @@ -42,7 +42,7 @@ namespace ICSharpCode.ILSpy } } - class ResourceTreeNode : ILSpyTreeNode + class ResourceTreeNode : ILSpyTreeNode { Resource r; diff --git a/ILSpy/TreeNodes/TypeTreeNode.cs b/ILSpy/TreeNodes/TypeTreeNode.cs index 92c20be47..75674294c 100644 --- a/ILSpy/TreeNodes/TypeTreeNode.cs +++ b/ILSpy/TreeNodes/TypeTreeNode.cs @@ -24,9 +24,9 @@ using System.Windows.Media; using ICSharpCode.Decompiler; using Mono.Cecil; -namespace ICSharpCode.ILSpy +namespace ICSharpCode.ILSpy.TreeNodes { - sealed class TypeTreeNode : ILSpyTreeNode + sealed class TypeTreeNode : ILSpyTreeNode { readonly TypeDefinition type; readonly AssemblyTreeNode parentAssemblyNode;