Changeset 3416 for trunk/sources/HeuristicLab.MainForm/3.2

Timestamp:

04/19/10 21:00:30 (15 years ago)

Author:

mkommend

Message:

implemented ContentViews and propagation of view state changes (ticket #982)

Location:

trunk/sources/HeuristicLab.MainForm/3.2

Files:

• HeuristicLab.MainForm-3.2.csproj (modified) (2 diffs)
• Interfaces/IContentView.cs (modified) (1 diff)
• Interfaces/IStorableContentView.cs (copied) (copied from trunk/sources/HeuristicLab.MainForm/3.2/Interfaces/IContentView.cs) (1 diff)
• Interfaces/IView.cs (modified) (1 diff)
• MainFormManager.cs (modified) (7 diffs)

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

@@ -85 +85 @@
   <ItemGroup>
     <None Include="HeuristicLabMainFormPlugin.cs.frame" />
+    <Compile Include="Interfaces\IStorableContentView.cs" />
     <Compile Include="ViewAttribute.cs" />
     <Compile Include="Interfaces\IContentView.cs" />
@@ -109 +110 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
+      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
+      <Name>HeuristicLab.Common-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>

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

@@ -24 +24 @@
 using System.Text;
 using System.ComponentModel;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm {
   public interface IContentView : IView {
-    object Content { get; set; }
-    bool SaveEnabled { get; }
+    IContent Content { get; set; }
+    bool Locked { get; set; }
+    event EventHandler LockedChanged;
   }
 }

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

@@ -24 +24 @@
 using System.Text;
 using System.ComponentModel;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm {
-  public interface IContentView : IView {
-    object Content { get; set; }
-    bool SaveEnabled { get; }
+  public interface IStorableContentView : IContentView {
+    new IStorableContent Content { get; set; }
   }
 }

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

@@ -27 +27 @@
 namespace HeuristicLab.MainForm {
   public interface IView {
-
     bool IsShown { get; }
     string Caption { get; set; }

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

@@ -26 +26 @@
 using HeuristicLab.PluginInfrastructure;
 using System.Diagnostics;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm {
@@ -75 +76 @@
 
     public static IEnumerable<Type> GetViewTypes(Type contentType) {
+      CheckForContentType(contentType);
       List<Type> viewTypes = (from v in views
                               where ContentAttribute.CanViewType(v, contentType)
@@ -86 +88 @@
 
     public static IEnumerable<Type> GetViewTypes(Type contentType, bool returnOnlyMostSpecificViewTypes) {
+      CheckForContentType(contentType);
       List<Type> viewTypes = new List<Type>(GetViewTypes(contentType));
       if (returnOnlyMostSpecificViewTypes) {
@@ -102 +105 @@
     }
 
-    public static bool ViewCanViewObject(IContentView view, object content) {
+    public static bool ViewCanViewObject(IContentView view, IContent content) {
       return ContentAttribute.CanViewType(view.GetType(), content.GetType());
     }
 
     public static Type GetDefaultViewType(Type contentType) {
+      CheckForContentType(contentType);
       //check base classes for default view
       Type type = contentType;
@@ -148 +152 @@
       return (IContentView)Activator.CreateInstance(t, content);
     }
-    public static IContentView CreateDefaultView(object content, bool readOnly) {
-      IContentView view = CreateDefaultView(content);
-      if (view != null)
-        view.ReadOnly = readOnly;
-      return view;
-    }
-
     public static IContentView CreateView(Type viewType) {
-      if (!typeof(IContentView).IsAssignableFrom(viewType))
+      if (!typeof(IView).IsAssignableFrom(viewType))
         throw new ArgumentException("View can not be created becaues given type " + viewType.ToString() + " is not of type IView.");
       if (viewType.IsGenericTypeDefinition)
@@ -163 +160 @@
       return (IContentView)Activator.CreateInstance(viewType);
     }
-    public static IContentView CreateView(Type viewType, bool readOnly) {
-      IContentView view = CreateView(viewType);
-      view.ReadOnly = readOnly;
-      return view;
-    }
-
     public static IContentView CreateView(Type viewType, object content) {
-      if (!typeof(IContentView).IsAssignableFrom(viewType))
-        throw new ArgumentException("View can not be created becaues given type " + viewType.ToString() + " is not of type IView.");
+      CheckForContentType(content.GetType());
+      CheckForContentViewType(viewType);
+
       Type view = viewType;
       if (view.IsGenericTypeDefinition)
@@ -178 +170 @@
       return (IContentView)Activator.CreateInstance(view, content);
     }
-    public static IContentView CreateView(Type viewType, object content, bool readOnly) {
-      IContentView view = CreateView(viewType, content);
-      view.ReadOnly = readOnly;
-      return view;
+
+    private static void CheckForContentType(Type contentType) {
+          if (!typeof(IContent).IsAssignableFrom(contentType))
+        throw new ArgumentException("DefaultViews are only specified for types of IContent and not for " + contentType + ".");
+    }
+    private static void CheckForContentViewType(Type viewType) {
+      if (!typeof(IContentView).IsAssignableFrom(viewType))
+        throw new ArgumentException("View can not be created becaues given type " + viewType.ToString() + " is not of type IContentView.");
     }