Changeset 2466 for trunk

Timestamp:

11/04/09 17:16:39 (15 years ago)

Author:

mkommend

Message:

implemented ContentAttribute and adapted MainFormManager (ticket #771)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.Test/3.2/EditorView.cs (modified) (3 diffs)
• HeuristicLab.MainForm.Test/3.2/FormView.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/FormView2.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/ContentAttribute.cs (moved) (moved from trunk/sources/HeuristicLab.MainForm/3.2/DefaultViewAttribute.cs) (1 diff)
• HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IView.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/MainFormManager.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.MainForm.Test/3.2/EditorView.cs

@@ -11 +11 @@
 
 namespace HeuristicLab.MainForm.Test {
-  [DefaultViewAttribute]
-  public partial class EditorView : ViewBase, IView<ArrayList> {
-    public EditorView() {
+  [Content(typeof(ArrayList),IsDefaultView=true)]
+  public partial class EditorView : ViewBase {
+    public EditorView()
+      : base() {
       InitializeComponent();
+    }
+
+    public EditorView(ArrayList list)
+      : this() {
     }
 
@@ -22 +27 @@
       IEnumerable<Type> views1 = MainFormManager.GetViewTypes(typeof(IList));
       views1.ToString();
-      //IEnumerable<Type> views2 = MainFormManager.GetViewTypes(typeof(object));
-      //views2.ToString();
-      Type def2 = MainFormManager.GetDefaultViewType(typeof(IList));
-      def2.ToString();
-      Type def1 = MainFormManager.GetDefaultViewType(typeof(ArrayList));
-      def1.ToString();
-      //Type def3 = MainFormManager.GetDefaultViewType(typeof(object));
-      //def3.ToString();
+      IEnumerable<Type> views2 = MainFormManager.GetViewTypes(typeof(IEnumerable));
+      views2.ToString();
 
-      MainFormManager.MainForm.HideView(this);
+      ArrayList list = new ArrayList();
+      IView defaultView = MainFormManager.CreateDefaultView(list);
+      MainFormManager.MainForm.ShowView(defaultView);
       this.OnChanged();
     }
@@ -45 +46 @@
       }
     }
-
-    #region IView<ArrayList> Members
-
-    public void View(ArrayList item) {
-      throw new NotImplementedException();
-    }
-
-    public ArrayList Item {
-      get { throw new NotImplementedException(); }
-    }
-
-    #endregion
   }
 }

trunk/sources/HeuristicLab.MainForm.Test/3.2/FormView.cs

@@ -11 +11 @@
 
 namespace HeuristicLab.MainForm.Test {
-  [DefaultViewAttribute]
-  public partial class FormView1 : ViewBase,IView<ICollection> {
-    private int[] array;
+  [Content(typeof(IList),true)]
+  public partial class FormView1 : FormView2 {
     public FormView1() {
       InitializeComponent();
     }
-
-    #region IView<ICollection> Members
-
-    public void View(ICollection item) {
-      throw new NotImplementedException();
-    }
-
-    public ICollection Item {
-      get { throw new NotImplementedException(); }
-    }
-
-    #endregion
   }
 }

trunk/sources/HeuristicLab.MainForm.Test/3.2/FormView2.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.MainForm.Test {
-  public partial class FormView2 : ViewBase, IView<IEnumerable> {
-    private int[] array;
+  [Content(typeof(IEnumerable))]
+  public partial class FormView2 : ViewBase {
     public FormView2() {
       InitializeComponent();
     }
-
-    #region IView<IEnumerable> Members
-
-    public void View(IEnumerable item) {
-      throw new NotImplementedException();
-    }
-
-    public IEnumerable Item {
-      get { throw new NotImplementedException(); }
-    }
-
-    #endregion
   }
 }

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

@@ -25 +25 @@
 
 namespace HeuristicLab.MainForm {
-  [AttributeUsage(AttributeTargets.Class)]
-  public class DefaultViewAttribute : Attribute {
-    public DefaultViewAttribute() {
+  [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+  public class ContentAttribute : Attribute {
+    private Type type;
+    public ContentAttribute(Type type) {
+      this.type = type;
     }
 
-    public static bool IsDefaultView(Type t) {
-      object[] attributes = t.GetCustomAttributes(typeof(DefaultViewAttribute), false);
-      return attributes != null && attributes.Length > 0;
+    public ContentAttribute(Type type, bool isDefaultView)
+      : this(type) {
+      this.isDefaultView = isDefaultView;
+    }
+
+    private bool isDefaultView;
+    public bool IsDefaultView {
+      get { return this.isDefaultView; }
+      set { this.isDefaultView = value; }
+    }
+
+    public static bool HasContentAttribute(Type viewType) {
+      ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), true);
+      return attributes.Length != 0;
+    }
+
+    public static bool CanViewType(Type viewType, Type content) {
+      ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), false);
+      return attributes.Any(a => a.type.IsAssignableFrom(content));
+    }
+
+    public static bool IsDefaultViewForType(Type viewType, Type content) {
+      ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), false);
+      return attributes.Any(a => a.isDefaultView && a.type == content);
+    }
+
+    public static IEnumerable<Type> GetTypesWhereViewTypeIsDefaultView(Type viewType) {
+      ContentAttribute[] attributes = (ContentAttribute[])viewType.GetCustomAttributes(typeof(ContentAttribute), true);
+      return from a in attributes
+             where a.isDefaultView
+             select a.type;
     }
   }

trunk/sources/HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj

@@ -92 +92 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UserInterfaceItemBase.cs" />
-    <Compile Include="DefaultViewAttribute.cs" />
+    <Compile Include="ContentAttribute.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IView.cs

@@ -33 +33 @@
     void OnClosed(object sender, EventArgs e);
   }
-
-  public interface IView<T> : IView {
-    void View(T item);
-    T Item { get; }
-  }
 }

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

@@ -29 +29 @@
     private static object locker;
     private static IMainForm mainform;
-    private static Dictionary<Type, List<Type>> views;
+    private static HashSet<Type> views;
     private static Dictionary<Type, Type> defaultViews;
 
     static MainFormManager() {
       locker = new object();
-      views = new Dictionary<Type, List<Type>>();
+      views = new HashSet<Type>();
       defaultViews = new Dictionary<Type, Type>();
     }
@@ -46 +46 @@
           IEnumerable<Type> types =
             from t in ds.GetTypes(typeof(IView))
-            where !t.IsAbstract && !t.IsInterface && !t.IsGenericType
+            where !t.IsAbstract && !t.IsInterface && !t.IsGenericType && ContentAttribute.HasContentAttribute(t)
             select t;
 
-          foreach (Type t in types) {
-            foreach (Type viewableType in GetViewableType(t)) {
-              if (viewableType != null) {
-                if (!views.ContainsKey(viewableType))
-                  views[viewableType] = new List<Type>();
-                views[viewableType].Add(t);
-
-                if (DefaultViewAttribute.IsDefaultView(t)) {
-                  if (defaultViews.ContainsKey(viewableType))
-                    throw new ArgumentException("DefaultView for type " + viewableType + " is " + defaultViews[viewableType] +
-                      ". Can't register additional DefaultView " + t + ".");
-                  defaultViews[viewableType] = t;
-                }
-              }
+          foreach (Type viewType in types) {
+            views.Add(viewType);
+            foreach (Type contentType in ContentAttribute.GetTypesWhereViewTypeIsDefaultView(viewType)) {
+              if (defaultViews.ContainsKey(contentType))
+                throw new ArgumentException("DefaultView for type " + contentType + " is " + defaultViews[contentType] +
+                  ". Can't register additional DefaultView " + viewType + ".");
+              defaultViews[contentType] = viewType;
             }
           }
         } else
           throw new ArgumentException("A mainform was already associated with the mainform manager.");
-      }
-    }
-
-    private static IEnumerable<Type> GetViewableType(Type t) {
-      IEnumerable<Type> interfaceTypes =
-       from type in t.GetInterfaces()
-       where type.Namespace == "HeuristicLab.MainForm" && type.Name.StartsWith("IView") &&
-             type.IsGenericType && !type.IsGenericTypeDefinition
-       select type;
-
-      foreach (Type interfaceType in interfaceTypes) {
-        yield return interfaceType.GetGenericArguments()[0];
       }
     }
@@ -90 +71 @@
     }
 
-    public static IEnumerable<Type> GetViewTypes(Type viewableType) {
-      List<Type> viewsForType = new List<Type>();
-      foreach (KeyValuePair<Type, List<Type>> v in views) {
-        if (v.Key.IsAssignableFrom(viewableType))
-          viewsForType.AddRange(v.Value);
-      }
-      return viewsForType.Distinct();
+    public static IEnumerable<Type> GetViewTypes(Type contentType) {
+      return from v in views
+             where ContentAttribute.CanViewType(v, contentType)
+             select v;
     }
 
     public static bool ViewCanViewObject(IView view, object o) {
-      return GetViewTypes(o.GetType()).Contains(view.GetType());
+      return ContentAttribute.CanViewType(view.GetType(), o.GetType());
     }
 
-    public static Type GetDefaultViewType(Type viewableType) {
+    public static Type GetDefaultViewType(Type contentType) {
       //check if viewableType has a default view
-      if (defaultViews.ContainsKey(viewableType))
-        return defaultViews[viewableType];
+      if (defaultViews.ContainsKey(contentType))
+        return defaultViews[contentType];
 
       //check base classes for default view
-      Type type = viewableType;
+      Type type = contentType;
       while (type.BaseType != null && !defaultViews.ContainsKey(type)) {
         type = type.BaseType;
@@ -118 +96 @@
       //check if exact one implemented interface has a default view
       List<Type> temp = (from t in defaultViews.Keys
-                         where t.IsAssignableFrom(viewableType) && t.IsInterface
+                         where t.IsAssignableFrom(contentType) && t.IsInterface
                          select t).ToList();
       if (temp.Count == 1)
@@ -124 +102 @@
       //more than one default view for implemented interfaces are found
       if (temp.Count > 1)
-        throw new Exception("Could not determine which is the default view for type " + viewableType.ToString() + ". Because more than one implemented interfaces have a default view.");
+        throw new Exception("Could not determine which is the default view for type " + contentType.ToString() + ". Because more than one implemented interfaces have a default view.");
       return null;
     }
 
-    public static IView<T> CreateDefaultView<T>(T objectToView) {
+    public static IView CreateDefaultView(object objectToView) {
       Type t = GetDefaultViewType(objectToView.GetType());
       if (t == null)
         return null;
       else
-        return (IView<T>)Activator.CreateInstance(t);
+        return (IView)Activator.CreateInstance(t, objectToView);
     }
   }