Changeset 2761 for trunk/sources/HeuristicLab.MainForm/3.2/ContentAttribute.cs

Timestamp:

02/08/10 15:35:20 (14 years ago)

Author:

mkommend

Message:

improved MainForm as suggested by FxCop (ticket #857)

File:

• trunk/sources/HeuristicLab.MainForm/3.2/ContentAttribute.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.MainForm/3.2/ContentAttribute.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Text;
+using System.Reflection;
 
 namespace HeuristicLab.MainForm {
   [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-  public class ContentAttribute : Attribute {
-    private Type type;
-    public ContentAttribute(Type type) {
-      this.type = type;
+  public sealed class ContentAttribute : Attribute {
+    public ContentAttribute(Type contentType) {
+      this.contentType = contentType;
     }
 
-    public ContentAttribute(Type type, bool isDefaultView)
-      : this(type) {
+    public ContentAttribute(Type contentType, bool isDefaultView)
+      : this(contentType) {
       this.isDefaultView = isDefaultView;
     }
@@ -44 +44 @@
     }
 
-    public static bool HasContentAttribute(Type viewType) {
+    private Type contentType;
+    public Type ContentType {
+      get { return this.contentType; }
+    }
+
+    public static bool HasContentAttribute(MemberInfo viewType) {
       ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), false);
       return attributes.Length != 0;
     }
 
-    public static bool CanViewType(Type viewType, Type content) {
+    public static bool CanViewType(MemberInfo viewType, Type content) {
       ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), false);
-      return attributes.Any(a => content.IsAssignableTo(a.type));
+      return attributes.Any(a => content.IsAssignableTo(a.contentType));
     }
 
@@ -58 +63 @@
       return from a in attributes
              where a.isDefaultView
-             select a.type;
+             select a.contentType;
     }
 
@@ -64 +69 @@
       ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), false);
       return from a in attributes
-             select a.type;
+             select a.contentType;
     }
   }