Changeset 2437 for branches

Timestamp:

10/18/09 01:08:12 (15 years ago)

Author:

mkommend

Message:

implemented changes regarding detection of view types and default views as discussed with SWA (ticket #771)

Location:

branches/Mainform refactoring

Files:

• HeuristicLab.MainForm.Test/3.2/Actions/NewFormAction.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/ButtonItems/SaveToolStripButtonItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/EditorView.cs (modified) (2 diffs)
• HeuristicLab.MainForm.Test/3.2/FormView.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/FormView.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/FormView2.Designer.cs (copied) (copied from branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/FormView.Designer.cs) (1 diff)
• HeuristicLab.MainForm.Test/3.2/FormView2.cs (copied) (copied from branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/FormView.cs) (2 diffs)
• HeuristicLab.MainForm.Test/3.2/FormView2.resx (copied) (copied from branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/FormView.resx)
• HeuristicLab.MainForm.Test/3.2/HeuristicLab.MainForm.Test-3.2.csproj (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/MainFormManager.cs (modified) (3 diffs)

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/Actions/NewFormAction.cs

@@ -9 +9 @@
     public void Execute(IMainForm mainform) {
       MessageBox.Show("New form called");
-      FormView x = new FormView();
+      FormView1 x = new FormView1();
       x.Caption = "FormView";
       mainform.ShowView(x);

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/ButtonItems/SaveToolStripButtonItem.cs

@@ -28 +28 @@
         this.ToolStripItem.Enabled = false;
       else
-        this.ToolStripItem.Enabled = !(mainform.ActiveView is FormView);
+        this.ToolStripItem.Enabled = !(mainform.ActiveView is FormView1);
     }
 

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/EditorView.cs

@@ -8 +8 @@
 using System.Windows.Forms;
 using HeuristicLab.MainForm.WindowsForms;
+using System.Collections;
 
 namespace HeuristicLab.MainForm.Test {
   [DefaultView]
-  public partial class EditorView : ViewBase<object>,IView<string> {
+  public partial class EditorView : ViewBase<IList> {
     public EditorView() {
       InitializeComponent();
@@ -17 +18 @@
 
     private void ChangeStateButton_Click(object sender, EventArgs e) {
-      IEnumerable<Type> views = MainFormManager.GetViewTypes(typeof(string));
+      IEnumerable<Type> views = MainFormManager.GetViewTypes(typeof(ArrayList));
       views.ToString();
-      IEnumerable<Type> views1 = MainFormManager.GetViewTypes(typeof(object));
+      IEnumerable<Type> views1 = MainFormManager.GetViewTypes(typeof(IList));
       views1.ToString();
-      Type def1 = MainFormManager.GetDefaultViewType(typeof(string));
+      //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 def2 = MainFormManager.GetDefaultViewType(typeof(object));
-      def2.ToString();
-
-      IView<string> v = MainFormManager.CreateDefaultView<string>("x");
-      v.Caption = "lala";
+      //Type def3 = MainFormManager.GetDefaultViewType(typeof(object));
+      //def3.ToString();
 
       this.OnChanged();

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/FormView.Designer.cs

@@ -1 +1 @@
 namespace HeuristicLab.MainForm.Test {
-  partial class FormView {
+  partial class FormView1 {
     /// <summary> 
     /// Required designer variable.

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/FormView.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.MainForm.Test {
-  public partial class FormView : ViewBase<object>  {
+  [DefaultView]
+  public partial class FormView1 : ViewBase<ICloneable>  {
     private int[] array;
-    public FormView() {
+    public FormView1() {
       InitializeComponent();
     }

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/FormView2.Designer.cs

@@ -1 +1 @@
 namespace HeuristicLab.MainForm.Test {
-  partial class FormView {
+  partial class FormView2 {
     /// <summary> 
     /// Required designer variable.

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/FormView2.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
+using System.Collections;
 using System.ComponentModel;
 using System.Drawing;
@@ -10 +10 @@
 
 namespace HeuristicLab.MainForm.Test {
-  public partial class FormView : ViewBase<object>  {
+  public partial class FormView2 : ViewBase<ArrayList>  {
     private int[] array;
-    public FormView() {
+    public FormView2() {
       InitializeComponent();
     }

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/HeuristicLab.MainForm.Test-3.2.csproj

@@ -87 +87 @@
     <Compile Include="ButtonItems\SaveToolStripButtonItem.cs" />
     <Compile Include="ButtonItems\OpenToolStripButtonItem.cs" />
+    <Compile Include="FormView2.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="FormView2.Designer.cs">
+      <DependentUpon>FormView2.cs</DependentUpon>
+    </Compile>
     <Compile Include="HeuristicLabSingleDocumentMainFormTestApplication.cs" />
     <Compile Include="HeuristicLabMultipleDocumentMainFormTestApplication.cs" />
@@ -140 +146 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="FormView2.resx">
+      <DependentUpon>FormView2.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="EditorView.resx">
       <DependentUpon>EditorView.cs</DependentUpon>

branches/Mainform refactoring/HeuristicLab.MainForm.WindowsForms/3.2/MainFormBase.cs

@@ -75 +75 @@
     public Type UserInterfaceItemType {
       get { return this.userInterfaceItemType; }
-      protected set { this.userInterfaceItemType = value; }
     }
 

branches/Mainform refactoring/HeuristicLab.MainForm/3.2/MainFormManager.cs

@@ -84 +84 @@
 
     public static IEnumerable<Type> GetViewTypes(Type viewableType) {
-      List<Type> viewsForType;
-      if (!views.ContainsKey(viewableType))
-        viewsForType = new List<Type>();
-      else
-        viewsForType = views[viewableType];
-
-      if (viewableType.BaseType != null)
-        viewsForType.AddRange(GetViewTypes(viewableType.BaseType));
+      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();
     }
@@ -100 +97 @@
 
     public static Type GetDefaultViewType(Type viewableType) {
-      if (!defaultViews.ContainsKey(viewableType))
-        return null;
-      return defaultViews[viewableType];
+      if (!defaultViews.ContainsKey(viewableType)) {
+        List<Type> temp = defaultViews.Keys.Where(x => x.IsAssignableFrom(viewableType)).ToList();
+        if (temp.Count == 0)
+          return null;
+        else if (temp.Count == 1)
+          return defaultViews[temp[0]];
+        else {
+          temp.Sort(delegate(Type t1, Type t2) {
+            if (t1.IsAssignableFrom(t2))
+              return 1;
+            return -1;
+          }
+          );
+          if (!temp[0].IsAssignableFrom(temp[1]) && !temp[1].IsAssignableFrom(temp[0]))
+            throw new Exception("Could not determine which is the default view for type " + viewableType.ToString() + ".");
+          else
+            return defaultViews[temp[0]];
+        }
+      } else
+        return defaultViews[viewableType];
     }
 
@@ -110 +124 @@
         return null;
       else
-        return (IView<T>) Activator.CreateInstance(t);
+        return (IView<T>)Activator.CreateInstance(t);
     }
   }