Renamed OverlayIcon to AccessOverlayIcon

ILSpy/ILSpy.csproj

@@ -110,8 +110,8 @@
     <Compile Include="ILAstLanguage.cs" />
     <Compile Include="ILLanguage.cs" />
     <Compile Include="ILSpySettings.cs" />
+    <Compile Include="Images\AccessOverlayIcon.cs" />
     <Compile Include="Images\MemberIcon.cs" />
-    <Compile Include="Images\OverlayIcon.cs" />
     <Compile Include="Images\TypeIcon.cs" />
     <Compile Include="ISmartTextOutput.cs" />
     <Compile Include="Language.cs" />

ILSpy/Images/AccessOverlayIcon.cs

@@ -23,7 +23,7 @@ using System;
 
 namespace ICSharpCode.ILSpy
 {
-	internal enum OverlayIcon
+	internal enum AccessOverlayIcon
 	{
 		Public,
 		Protected,

ILSpy/Images/Images.cs

@@ -85,12 +85,12 @@ namespace ICSharpCode.ILSpy
 		private static TypeIconCache typeIconCache = new TypeIconCache();
 		private static MemberIconCache memberIconCache = new MemberIconCache();
 
-		public static ImageSource GetIcon(TypeIcon icon, OverlayIcon overlay)
+		public static ImageSource GetIcon(TypeIcon icon, AccessOverlayIcon overlay)
 		{
 			return typeIconCache.GetIcon(icon, overlay, false);
 		}
 
-		public static ImageSource GetIcon(MemberIcon icon, OverlayIcon overlay, bool isStatic)
+		public static ImageSource GetIcon(MemberIcon icon, AccessOverlayIcon overlay, bool isStatic)
 		{
 			return memberIconCache.GetIcon(icon, overlay, isStatic);
 		}
@@ -199,17 +199,17 @@ namespace ICSharpCode.ILSpy
 
 		private abstract class IconCache<T>
 		{
-			private Dictionary<Tuple<T, OverlayIcon, bool>, ImageSource> cache = new Dictionary<Tuple<T, OverlayIcon, bool>, ImageSource>();
+			private Dictionary<Tuple<T, AccessOverlayIcon, bool>, ImageSource> cache = new Dictionary<Tuple<T, AccessOverlayIcon, bool>, ImageSource>();
 
 			protected void PreloadPublicIconToCache(T icon, ImageSource image)
 			{
-				var iconKey = new Tuple<T, OverlayIcon, bool>(icon, OverlayIcon.Public, false);
+				var iconKey = new Tuple<T, AccessOverlayIcon, bool>(icon, AccessOverlayIcon.Public, false);
 				cache.Add(iconKey, image);
 			}
 
-			public ImageSource GetIcon(T icon, OverlayIcon overlay, bool isStatic)
+			public ImageSource GetIcon(T icon, AccessOverlayIcon overlay, bool isStatic)
 			{
-				var iconKey = new Tuple<T, OverlayIcon, bool>(icon, overlay, isStatic);
+				var iconKey = new Tuple<T, AccessOverlayIcon, bool>(icon, overlay, isStatic);
 				if (cache.ContainsKey(iconKey)) {
 					return cache[iconKey];
 				} else {
@@ -219,7 +219,7 @@ namespace ICSharpCode.ILSpy
 				}
 			}
 
-			private ImageSource BuildMemberIcon(T icon, OverlayIcon overlay, bool isStatic)
+			private ImageSource BuildMemberIcon(T icon, AccessOverlayIcon overlay, bool isStatic)
 			{
 				ImageSource baseImage = GetBaseImage(icon);
 				ImageSource overlayImage = GetOverlayImage(overlay);
@@ -229,23 +229,23 @@ namespace ICSharpCode.ILSpy
 
 			protected abstract ImageSource GetBaseImage(T icon);
 
-			private static ImageSource GetOverlayImage(OverlayIcon overlay)
+			private static ImageSource GetOverlayImage(AccessOverlayIcon overlay)
 			{
 				ImageSource overlayImage;
 				switch (overlay) {
-					case OverlayIcon.Public:
+					case AccessOverlayIcon.Public:
 						overlayImage = null;
 						break;
-					case OverlayIcon.Protected:
+					case AccessOverlayIcon.Protected:
 						overlayImage = Images.OverlayProtected;
 						break;
-					case OverlayIcon.Internal:
+					case AccessOverlayIcon.Internal:
 						overlayImage = Images.OverlayInternal;
 						break;
-					case OverlayIcon.ProtectedInternal:
+					case AccessOverlayIcon.ProtectedInternal:
 						overlayImage = Images.OverlayProtectedInternal;
 						break;
-					case OverlayIcon.Private:
+					case AccessOverlayIcon.Private:
 						overlayImage = Images.OverlayPrivate;
 						break;
 					default:

ILSpy/TreeNodes/EventTreeNode.cs

@@ -60,19 +60,19 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			get { return Images.GetIcon(MemberIcon.Event, GetOverlayIcon(ev.AddMethod.Attributes), ev.AddMethod.IsStatic); }
 		}
 
-		private static OverlayIcon GetOverlayIcon(MethodAttributes methodAttributes)
+		private static AccessOverlayIcon GetOverlayIcon(MethodAttributes methodAttributes)
 		{
 			switch (methodAttributes & MethodAttributes.MemberAccessMask) {
 				case MethodAttributes.Public:
-					return OverlayIcon.Public;
+					return AccessOverlayIcon.Public;
 				case MethodAttributes.Assembly:
 				case MethodAttributes.FamANDAssem:
-					return OverlayIcon.Internal;
+					return AccessOverlayIcon.Internal;
 				case MethodAttributes.Family:
 				case MethodAttributes.FamORAssem:
-					return OverlayIcon.Protected;
+					return AccessOverlayIcon.Protected;
 				case MethodAttributes.Private:
-					return OverlayIcon.Private;
+					return AccessOverlayIcon.Private;
 				default:
 					throw new NotSupportedException();
 			}

ILSpy/TreeNodes/FieldTreeNode.cs

@@ -65,19 +65,19 @@ namespace ICSharpCode.ILSpy.TreeNodes
 				return Images.GetIcon(MemberIcon.Field, GetOverlayIcon(field.Attributes), field.IsStatic);
 		}
 
-		private static OverlayIcon GetOverlayIcon(FieldAttributes fieldAttributes)
+		private static AccessOverlayIcon GetOverlayIcon(FieldAttributes fieldAttributes)
 		{
 			switch (fieldAttributes & FieldAttributes.FieldAccessMask) {
 				case FieldAttributes.Public:
-					return OverlayIcon.Public;
+					return AccessOverlayIcon.Public;
 				case FieldAttributes.Assembly:
 				case FieldAttributes.FamANDAssem:
-					return OverlayIcon.Internal;
+					return AccessOverlayIcon.Internal;
 				case FieldAttributes.Family:
 				case FieldAttributes.FamORAssem:
-					return OverlayIcon.Protected;
+					return AccessOverlayIcon.Protected;
 				case FieldAttributes.Private:
-					return OverlayIcon.Private;
+					return AccessOverlayIcon.Private;
 				default:
 					throw new NotSupportedException();
 			}

ILSpy/TreeNodes/MethodTreeNode.cs

@@ -92,19 +92,19 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			return Images.GetIcon(MemberIcon.Method, GetOverlayIcon(method.Attributes), method.IsStatic);
 		}
 
-		private static OverlayIcon GetOverlayIcon(MethodAttributes methodAttributes)
+		private static AccessOverlayIcon GetOverlayIcon(MethodAttributes methodAttributes)
 		{
 			switch (methodAttributes & MethodAttributes.MemberAccessMask) {
 				case MethodAttributes.Public:
-					return OverlayIcon.Public;
+					return AccessOverlayIcon.Public;
 				case MethodAttributes.Assembly:
 				case MethodAttributes.FamANDAssem:
-					return OverlayIcon.Internal;
+					return AccessOverlayIcon.Internal;
 				case MethodAttributes.Family:
 				case MethodAttributes.FamORAssem:
-					return OverlayIcon.Protected;
+					return AccessOverlayIcon.Protected;
 				case MethodAttributes.Private:
-					return OverlayIcon.Private;
+					return AccessOverlayIcon.Private;
 				default:
 					throw new NotSupportedException();
 			}

ILSpy/TreeNodes/PropertyTreeNode.cs

@@ -70,19 +70,19 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			return Images.GetIcon(icon, GetOverlayIcon(attributesOfMostAccessibleMethod), IsStatic);
 		}
 
-		private static OverlayIcon GetOverlayIcon(MethodAttributes methodAttributes)
+		private static AccessOverlayIcon GetOverlayIcon(MethodAttributes methodAttributes)
 		{
 			switch (methodAttributes & MethodAttributes.MemberAccessMask) {
 				case MethodAttributes.Public:
-					return OverlayIcon.Public;
+					return AccessOverlayIcon.Public;
 				case MethodAttributes.Assembly:
 				case MethodAttributes.FamANDAssem:
-					return OverlayIcon.Internal;
+					return AccessOverlayIcon.Internal;
 				case MethodAttributes.Family:
 				case MethodAttributes.FamORAssem:
-					return OverlayIcon.Protected;
+					return AccessOverlayIcon.Protected;
 				case MethodAttributes.Private:
-					return OverlayIcon.Private;
+					return AccessOverlayIcon.Private;
 				default:
 					throw new NotSupportedException();
 			}

ILSpy/TreeNodes/TypeTreeNode.cs

@@ -139,7 +139,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		public static ImageSource GetIcon(TypeDefinition type)
 		{
 			TypeIcon typeIcon = GetTypeIcon(type);
-			OverlayIcon overlayIcon = GetOverlayIcon(type);
+			AccessOverlayIcon overlayIcon = GetOverlayIcon(type);
 
 			return Images.GetIcon(typeIcon, overlayIcon);
 		}
@@ -161,25 +161,25 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			}
 		}
 
-		private static OverlayIcon GetOverlayIcon(TypeDefinition type)
+		private static AccessOverlayIcon GetOverlayIcon(TypeDefinition type)
 		{
-			OverlayIcon overlay;
+			AccessOverlayIcon overlay;
 			switch (type.Attributes & TypeAttributes.VisibilityMask) {
 				case TypeAttributes.Public:
 				case TypeAttributes.NestedPublic:
-					overlay = OverlayIcon.Public;
+					overlay = AccessOverlayIcon.Public;
 					break;
 				case TypeAttributes.NotPublic:
 				case TypeAttributes.NestedAssembly:
 				case TypeAttributes.NestedFamANDAssem:
-					overlay = OverlayIcon.Internal;
+					overlay = AccessOverlayIcon.Internal;
 					break;
 				case TypeAttributes.NestedFamily:
 				case TypeAttributes.NestedFamORAssem:
-					overlay = OverlayIcon.Protected;
+					overlay = AccessOverlayIcon.Protected;
 					break;
 				case TypeAttributes.NestedPrivate:
-					overlay = OverlayIcon.Private;
+					overlay = AccessOverlayIcon.Private;
 					break;
 				default:
 					throw new NotSupportedException();