Changeset 3557 for trunk/sources/HeuristicLab.MainForm/3.3/MainFormManager.cs

Timestamp:

04/29/10 15:10:17 (14 years ago)

Author:

mkommend

Message:

changed logic of showing new views (ticket #972)

File:

• trunk/sources/HeuristicLab.MainForm/3.3/MainFormManager.cs (modified) (2 diffs)

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

@@ -105 +105 @@
     }
 
-    public static bool ViewCanViewObject(IContentView view, IContent content) {
+    public static bool ViewCanViewContent(IContentView view, IContent content) {
       return ContentAttribute.CanViewType(view.GetType(), content.GetType());
     }
@@ -145 +145 @@
     }
 
-    public static IContentView CreateDefaultView(object content) {
-      Type t = GetDefaultViewType(content.GetType());
+    public static IContentView CreateDefaultView(Type contentType) {
+      CheckForContentType(contentType);
+      Type t = GetDefaultViewType(contentType);
       if (t == null)
         return null;
 
-      return (IContentView)Activator.CreateInstance(t, content);
+      return (IContentView)Activator.CreateInstance(t);
     }
     public static IContentView CreateView(Type viewType) {
-      if (!typeof(IView).IsAssignableFrom(viewType))
-        throw new ArgumentException("View can not be created becaues given type " + viewType.ToString() + " is not of type IView.");
+      CheckForContentViewType(viewType);
       if (viewType.IsGenericTypeDefinition)
         throw new ArgumentException("View can not be created becaues given type " + viewType.ToString() + " is a generic type definition.");
 
       return (IContentView)Activator.CreateInstance(viewType);
-    }
-    public static IContentView CreateView(Type viewType, object content) {
-      CheckForContentType(content.GetType());
-      CheckForContentViewType(viewType);
-
-      Type view = viewType;
-      if (view.IsGenericTypeDefinition)
-        view = TransformGenericTypeDefinition(view, content.GetType());
-
-      return (IContentView)Activator.CreateInstance(view, content);
     }