Changeset 2466 for trunk/sources/HeuristicLab.MainForm.Test

Timestamp:

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

Author:

mkommend

Message:

implemented ContentAttribute and adapted MainFormManager (ticket #771)

Location:

trunk/sources/HeuristicLab.MainForm.Test/3.2

Files:

• EditorView.cs (modified) (3 diffs)
• FormView.cs (modified) (1 diff)
• FormView2.cs (modified) (1 diff)

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
   }
 }