Changeset 3796

Timestamp:

05/12/10 14:27:11 (14 years ago)

Author:

mkommend

Message:

corrected opening of views from the RunCollectionView (ticket #893)

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.3/MainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (1 diff)

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

@@ -222 +222 @@
 
     public IContentView ShowContent(IContent content) {
+      if (content == null)
+        throw new ArgumentNullException("Content cannot be null.");
       Type viewType = MainFormManager.GetDefaultViewType(content.GetType());
       if (viewType != null)
@@ -228 +230 @@
     }
 
-    internal IContentView ShowContent(IContent content, Type viewType) {
+    public IContentView ShowContent(IContent content, Type viewType) {
+      if (content == null)
+        throw new ArgumentNullException("Content cannot be null.");
       if (viewType == null)
-        throw new ArgumentNullException("Could not create view of type null");
+        throw new ArgumentNullException("ViewType cannot be null.");
 
       IContentView view;

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

@@ -243 +243 @@
 
     private void viewsLabel_DoubleClick(object sender, EventArgs e) {
-      IContentView view = MainFormManager.GetMainForm<MainForm>().ShowContent(this.Content, this.ViewType);
+      IContentView view = MainFormManager.MainForm.ShowContent(this.Content, this.ViewType);
       if (view != null) {
         view.ReadOnly = this.ReadOnly;

trunk/sources/HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs

@@ -43 +43 @@
 
     IContentView ShowContent(IContent content);
+    IContentView ShowContent(IContent content, Type viewType);
 
     Type UserInterfaceItemType { get; }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

@@ -260 +260 @@
     protected virtual void menuItem_Click(object sender, EventArgs e) {
       ToolStripMenuItem menuItem = (ToolStripMenuItem)sender;
-      IContentView view = MainFormManager.CreateView((Type)menuItem.Tag);
+      Type viewType = (Type)menuItem.Tag;
+      IContentView view = MainFormManager.MainForm.ShowContent(Content, viewType);
       if (view != null) {
         view.Locked = Locked;
         view.ReadOnly = ReadOnly;
-        view.Show();
-        view.Content = Content;
       }
     }