Changeset 3557

Timestamp:

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

Author:

mkommend

Message:

changed logic of showing new views (ticket #972)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/Clipboard.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/OperatorTreeView.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/ContentView.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/DockingMainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForm.cs (modified) (10 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MultipleDocumentMainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/SingleDocumentMainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/View.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (7 diffs)
• HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs (modified) (2 diffs)
• HeuristicLab.MainForm/3.3/MainFormManager.cs (modified) (2 diffs)
• HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionTabularView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunView.cs (modified) (3 diffs)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/StartPage.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core.Views/3.3/Clipboard.cs

@@ -231 +231 @@
       if (listView.SelectedItems.Count == 1) {
         T item = (T)listView.SelectedItems[0].Tag;
-        IView view = MainFormManager.CreateDefaultView(item);
+        IView view = MainFormManager.MainForm.ShowContent(item);
         if (view != null) {
           view.ReadOnly = this.ReadOnly;
-          view.Show();
         }
       }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

@@ -229 +229 @@
         T item = itemsListView.SelectedItems[0].Tag as T;
         if (item != null) {
-          IContentView view = MainFormManager.CreateDefaultView(item);
+          IContentView view = MainFormManager.MainForm.ShowContent(item);
           if (view != null) {
             view.ReadOnly = ReadOnly;
             view.Locked = Locked;
-            view.Show();
           }
         }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -189 +189 @@
       if (itemsListView.SelectedItems.Count == 1) {
         T item = (T)itemsListView.SelectedItems[0].Tag;
-        IContentView view = MainFormManager.CreateDefaultView(item);
+        IContentView view = MainFormManager.MainForm.ShowContent(item);
         if (view != null) {
           view.ReadOnly = ReadOnly;
           view.Locked = Locked;
-          view.Show();
         }
       }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -223 +223 @@
       if (itemsListView.SelectedItems.Count == 1) {
         T item = (T)itemsListView.SelectedItems[0].Tag;
-        IContentView view = MainFormManager.CreateDefaultView(item);
+        IContentView view = MainFormManager.MainForm.ShowContent(item);
         if (view != null) {
           view.ReadOnly = ReadOnly;
           view.Locked = Locked;
-          view.Show();
         }
       }

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorTreeView.cs

@@ -355 +355 @@
         IOperator op = GetOperatorTag(graphTreeView.SelectedNode);
         if (op != null) {
-          IContentView view = MainFormManager.CreateDefaultView(op);
-          if (view != null) {
-            view.ReadOnly = this.ReadOnly;
-            view.Locked = this.Locked;
+          Type viewType = MainFormManager.GetDefaultViewType(op.GetType());
+          if (viewType != null) {
             viewToolStripMenuItem.Enabled = true;
-            viewToolStripMenuItem.Tag = view;
+            viewToolStripMenuItem.Tag = op;
           }
           breakpointToolStripMenuItem.Enabled = true;
@@ -414 +412 @@
     #region Context Menu Events
     private void viewToolStripMenuItem_Click(object sender, EventArgs e) {
-      IView view = ((ToolStripMenuItem)sender).Tag as IView;
-      if (view != null) view.Show();
+      IOperator op = ((ToolStripMenuItem)sender).Tag as IOperator;
+      IContentView view = MainFormManager.MainForm.ShowContent(op);
+      if (view != null) {
+        view.ReadOnly = this.ReadOnly;
+        view.Locked = this.Locked;
+      }
     }
     private void breakpointToolStripMenuItem_Click(object sender, EventArgs e) {

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

@@ -37 +37 @@
       get { return content; }
       set {
-        if ((value != null) && (!MainFormManager.ViewCanViewObject(this, value)))
+        if ((value != null) && (!MainFormManager.ViewCanViewContent(this, value)))
           throw new ArgumentException(string.Format("View \"{0}\" cannot view object \"{1}\".", this.GetType().Name, value.GetType().Name));
         if (InvokeRequired) {
@@ -57 +57 @@
       InitializeComponent();
       this.locked = false;
-    }
-    public ContentView(IContent content)
-      : this() {
-      this.content = content;
     }
 

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

@@ -40 +40 @@
       InitializeComponent();
     }
-    public DockingMainForm(Type userInterfaceItemType, bool showViewsInViewHost)
+    public DockingMainForm(Type userInterfaceItemType, bool showContentInViewHost)
       : this(userInterfaceItemType) {
-      this.ShowViewsInViewHost = showViewsInViewHost;
+      this.ShowContentInViewHost = showContentInViewHost;
     }
 
@@ -67 +67 @@
 
     protected override Form CreateForm(IView view) {
-      DockForm form;
-      IContentView contentView = view as IContentView;
-      if (ShowViewsInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
-        ViewHost viewHost = new ViewHost(contentView);
-        form = new DockForm(viewHost);
-        this.AddViewFormCombination(viewHost, form);
-      } else {
-        form = new DockForm(view);
-        this.AddViewFormCombination(view, form);
-      }
-      return form;
+      return new DockForm(view);
     }
 

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

@@ -32 +32 @@
 using System.Collections;
 using WeifenLuo.WinFormsUI.Docking;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm.WindowsForms {
@@ -43 +44 @@
       this.userInterfaceItems = new List<IUserInterfaceItem>();
       this.initialized = false;
-      this.showViewsInViewHost = false;
+      this.showContentInViewHost = false;
     }
 
@@ -52 +53 @@
 
     #region properties
-    private bool showViewsInViewHost;
-    public bool ShowViewsInViewHost {
-      get { return this.showViewsInViewHost; }
-      set { this.showViewsInViewHost = value; }
+    private bool showContentInViewHost;
+    public bool ShowContentInViewHost {
+      get { return this.showContentInViewHost; }
+      set { this.showContentInViewHost = value; }
     }
 
@@ -88 +89 @@
     public IEnumerable<IView> Views {
       get { return views.Keys; }
-    }
-    protected void AddViewFormCombination(IView view, Form form) {
-      this.views.Add(view, form);
-      view.Changed += new EventHandler(View_Changed);
     }
 
@@ -216 +213 @@
 
     internal Form GetForm(IView view) {
-      IView internalView = GetView(view);
-      if (internalView != null && views.ContainsKey(internalView))
-        return views[internalView];
+      if (views.ContainsKey(view))
+        return views[view];
       return null;
     }
@@ -224 +220 @@
       return views.Where(x => x.Value == form).Single().Key;
     }
-    private IView GetView(IView view) {
-      if (view == null || views.ContainsKey(view))
-        return view;
-      IContentView contentView = view as IContentView;
-      if (contentView != null) {
-        IView viewHost =
-          (from ViewHost v in views.Keys.OfType<ViewHost>()
-           where v.Views.Contains(contentView)
-           select v).SingleOrDefault();
-        return viewHost;
-      }
-      return contentView;
+
+    public IContentView ShowContent(IContent content) {
+      IContentView view;
+      if (this.ShowContentInViewHost)
+        view = new ViewHost();
+      else
+        view = MainFormManager.CreateDefaultView(content.GetType());
+
+      if (view != null) {
+        view.Show();
+        view.Content = content;
+      }
+      return view;
     }
 
@@ -243 +240 @@
         Form form = GetForm(view);
         bool firstTimeShown = form == null;
-        if (form == null) {
+        if (firstTimeShown) {
           form = CreateForm(view);
           form.Activated += new EventHandler(FormActivated);
           form.FormClosed += new FormClosedEventHandler(ChildFormClosed);
-        }
-        IView internalView = GetView(form);
-        this.ShowView(internalView, firstTimeShown);
-        this.OnViewShown(internalView, firstTimeShown);
+          view.Changed += new EventHandler(View_Changed);
+          views[view] = form;
+        }
+        this.ShowView(view, firstTimeShown);
+        this.OnViewShown(view, firstTimeShown);
       }
     }
@@ -267 +265 @@
       if (InvokeRequired) Invoke((Action<IView>)HideView, view);
       else {
-        IView internalView = this.GetView(view);
-        if (internalView != null && this.views.ContainsKey(internalView)) {
-          this.Hide(internalView);
-          if (this.activeView == internalView)
-            this.ActiveView = null;
-          this.OnViewHidden(internalView);
-        }
+        this.Hide(view);
+        if (this.activeView == view)
+          this.ActiveView = null;
+        this.OnViewHidden(view);
       }
     }
@@ -296 +291 @@
     internal void CloseView(IView view) {
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
-      else {
-        IView internalView = GetView(view);
-        if (internalView != null && this.views.ContainsKey(internalView)) {
-          this.views[internalView].Close();
-          this.OnViewClosed(internalView);
-        }
+      else if (views.ContainsKey(view)) {
+        this.views[view].Close();
+        this.OnViewClosed(view);
       }
     }
@@ -307 +299 @@
     internal void CloseView(IView view, CloseReason closeReason) {
       if (InvokeRequired) Invoke((Action<IView>)CloseView, view);
-      else {
-        IView internalView = GetView(view);
-        if (internalView != null && this.views.ContainsKey(internalView)) {
-          ((View)internalView).CloseReason = closeReason;
-          this.CloseView(internalView);
-        }
+      else if (views.ContainsKey(view)) {
+        ((View)view).CloseReason = closeReason;
+        this.CloseView(view);
       }
     }

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

@@ -39 +39 @@
       InitializeComponent();
     }
-    public MultipleDocumentMainForm(Type userInterfaceItemType, bool showViewsInViewHost)
+    public MultipleDocumentMainForm(Type userInterfaceItemType, bool showContentInViewHost)
       : this(userInterfaceItemType) {
-      this.ShowViewsInViewHost = showViewsInViewHost;
+      this.ShowContentInViewHost = showContentInViewHost;
     }
 
@@ -76 +76 @@
 
     protected override Form CreateForm(IView view) {
-      Form form;
-      IContentView contentView = view as IContentView;
-      if (ShowViewsInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
-        ViewHost viewHost = new ViewHost(contentView);
-        form = new DocumentForm(viewHost);
-        this.AddViewFormCombination(viewHost, form);
-      } else {
-        form = new DocumentForm(view);
-        this.AddViewFormCombination(view, form);
-      }
-
+      Form form = new DocumentForm(view);
       form.MdiParent = this;
       return form;

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

@@ -40 +40 @@
       InitializeComponent();
     }
-    public SingleDocumentMainForm(Type userInterfaceItemType, bool showViewsInViewHost)
+    public SingleDocumentMainForm(Type userInterfaceItemType, bool showContentInViewHost)
       : this(userInterfaceItemType) {
-      this.ShowViewsInViewHost = showViewsInViewHost;
+      this.ShowContentInViewHost = showContentInViewHost;
     }
 
@@ -70 +70 @@
 
     protected override Form CreateForm(IView view) {
-      Form form;
-      IContentView contentView = view as IContentView;
-      if (ShowViewsInViewHost && contentView != null && contentView.GetType() != typeof(ViewHost)) {
-        ViewHost viewHost = new ViewHost(contentView);
-        form = new DocumentForm(viewHost);
-        this.AddViewFormCombination(viewHost, form);
-      } else {
-        form = new DocumentForm(view);
-        this.AddViewFormCombination(view, form);
-      }
-
+      Form form = new DocumentForm(view);
       form.ShowInTaskbar = true;
       return form;

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

@@ -35 +35 @@
       this.closeReason = CloseReason.None;
       this.readOnly = false;
-    }
-
-    public View(bool readOnly)
-      : this() {
-      this.readOnly = readOnly;
     }
 

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

@@ -28 +28 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  [Content(typeof(object))]
+  [Content(typeof(IContent))]
   public sealed partial class ViewHost : AsynchronousContentView {
     public ViewHost() {
@@ -39 +39 @@
       Content = null;
       OnContentChanged();
-    }
-    public ViewHost(IContent content)
-      : this() {
-      this.Content = content;
-    }
-
-    public ViewHost(IContentView contentView)
-      : this() {
-      this.viewType = contentView.GetType();
-      this.Content = contentView.Content;
-      this.cachedViews.Add(contentView.GetType(), contentView);
-      this.activeView = contentView;
-      this.RegisterActiveViewEvents();
-      this.OnViewTypeChanged();
-      this.ActiveViewChanged();
     }
 
@@ -117 +102 @@
     }
 
-
-
     protected override void OnContentChanged() {
       messageLabel.Visible = false;
@@ -133 +116 @@
         }
 
-
         if (!ViewCanShowContent(viewType, Content)) {
           ViewType = MainFormManager.GetDefaultViewType(Content.GetType());
@@ -148 +130 @@
       }
     }
-
 
     private void OnViewTypeChanged() {
@@ -176 +157 @@
     }
 
-
-
     private void RegisterActiveViewEvents() {
       activeView.Changed += new EventHandler(activeView_Changed);
@@ -256 +235 @@
 
     private void viewsLabel_DoubleClick(object sender, EventArgs e) {
-      IContentView view = MainFormManager.CreateView(viewType, Content);
+      IContentView view = MainFormManager.MainForm.ShowContent(this.Content);
       view.ReadOnly = this.ReadOnly;
       view.Locked = this.Locked;
-      view.Show();
     }
     private void viewContextMenuStrip_ItemClicked(object sender, ToolStripItemClickedEventArgs e) {

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

@@ -26 +26 @@
 using System.Drawing;
 using System.ComponentModel;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm {
@@ -41 +42 @@
     event EventHandler<ViewEventArgs> ViewHidden;
 
+    IContentView ShowContent(IContent content);
+
     Type UserInterfaceItemType { get; }
     void CloseAllViews();

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

trunk/sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphView.cs

@@ -157 +157 @@
           if (shapeInfo != null) {
             IOperator op = this.VisualizationInfo.GetOperatorForShapeInfo(shapeInfo);
-            IContentView view = MainFormManager.CreateDefaultView(op);
+            IContentView view = MainFormManager.MainForm.ShowContent(op);
             if (view != null) {
               view.ReadOnly = this.ReadOnly;
               view.Locked = this.Locked;
-              view.Show();
             }
             HandledMouseEventArgs eventArgs = e as HandledMouseEventArgs;
@@ -197 +196 @@
       if (shapeInfo != null) {
         IOperator op = this.VisualizationInfo.GetOperatorForShapeInfo(shapeInfo);
-        IContentView view = MainFormManager.CreateDefaultView(op);
-        view.ReadOnly = this.ReadOnly;
-        view.Locked = this.Locked;
-        view.Show();
+        IContentView view = MainFormManager.MainForm.ShowContent(op);
+        if (view != null) {
+          view.ReadOnly = this.ReadOnly;
+          view.Locked = this.Locked;
+        }
       }
     }

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

@@ -153 +153 @@
 
     protected virtual void createUserDefinedAlgorithmButton_Click(object sender, EventArgs e) {
-      IContentView view = MainFormManager.CreateDefaultView(Content.CreateUserDefinedAlgorithm());
+      IContentView view = MainFormManager.MainForm.ShowContent(Content.CreateUserDefinedAlgorithm());
       if (view != null) {
         view.ReadOnly = this.ReadOnly;
         view.Locked = this.Locked;
-        view.Show();
       }
     }

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

@@ -289 +289 @@
         IRun run = (IRun)((DataPoint)h.Object).Tag;
         if (e.Clicks >= 2) {
-          IContentView view = MainFormManager.CreateDefaultView(run);
-          view.ReadOnly = this.ReadOnly;
-          view.Locked = this.Locked;
-          view.Show();
+          IContentView view = MainFormManager.MainForm.ShowContent(run);
+          if (view != null) {
+            view.ReadOnly = this.ReadOnly;
+            view.Locked = this.Locked;
+          }
         } else
           this.draggedRun = run;

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

@@ -102 +102 @@
       if (e.RowIndex >= 0) {
         IRun run = Content.ElementAt(virtualRowIndizes[e.RowIndex]);
-        IContentView view = MainFormManager.CreateDefaultView(run);
+        IContentView view = MainFormManager.MainForm.ShowContent(run);
         if (view != null) {
           view.ReadOnly = this.ReadOnly;
           view.Locked = this.Locked;
-          view.Show();
         }
       }

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

@@ -195 +195 @@
       if (itemsListView.SelectedItems.Count == 1) {
         IRun item = (IRun)itemsListView.SelectedItems[0].Tag;
-        IContentView view = MainFormManager.CreateDefaultView(item);
+        IContentView view = MainFormManager.MainForm.ShowContent(item);
         if (view != null) {
           view.ReadOnly = ReadOnly;
           view.Locked = Locked;
-          view.Show();
         }
       }
@@ -242 +241 @@
     protected virtual void menuItem_Click(object sender, EventArgs e) {
       ToolStripMenuItem menuItem = (ToolStripMenuItem)sender;
-      IContentView view = MainFormManager.CreateView((Type)menuItem.Tag, Content);
+      IContentView view = MainFormManager.CreateView((Type)menuItem.Tag);
       if (view != null) {
         view.Locked = Locked;
         view.ReadOnly = ReadOnly;
         view.Show();
+        view.Content = Content;
       }
     }

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

@@ -119 +119 @@
       if (listView.SelectedItems.Count == 1) {
         viewHost.ViewType = null;
-        viewHost.Content = (IContent) listView.SelectedItems[0].Tag;
+        viewHost.Content = (IContent)listView.SelectedItems[0].Tag;
       } else {
         viewHost.Content = null;
@@ -127 +127 @@
       if (listView.SelectedItems.Count == 1) {
         IItem item = (IItem)listView.SelectedItems[0].Tag;
-        IContentView view = MainFormManager.CreateDefaultView(item);
+        IContentView view = MainFormManager.MainForm.ShowContent(item);
         if (view != null) {
           view.ReadOnly = ReadOnly;
           view.Locked = Locked;
-          view.Show();
         }
       }
@@ -147 +146 @@
     private void showAlgorithmButton_Click(object sender, EventArgs e) {
       if (!Locked) {
-        IContentView view = MainFormManager.CreateDefaultView(Content.Algorithm.Clone());
-        if (view != null) {
-          view.Show();
-        }
+        MainFormManager.MainForm.ShowContent((IContent)Content.Algorithm.Clone());
       }
     }

trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -42 +42 @@
       if (newItemDialog == null) newItemDialog = new NewItemDialog();
       if (newItemDialog.ShowDialog() == DialogResult.OK) {
-        IView view = MainFormManager.CreateDefaultView(newItemDialog.Item);
+        IView view = MainFormManager.MainForm.ShowContent(newItemDialog.Item);
         if (view == null) MessageBox.Show("There is no view for the new item. It cannot be displayed.", "No View Available", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        else view.Show();
       }
     }
@@ -69 +68 @@
         if (error != null) throw error;
         Invoke(delegate() {
-          IView view = MainFormManager.CreateDefaultView(content);
+          IView view = MainFormManager.MainForm.ShowContent(content);
           if (view == null) MessageBox.Show("There is no view for the loaded item. It cannot be displayed.", "No View Available", MessageBoxButtons.OK, MessageBoxIcon.Error);
-          else view.Show();
         });
       }

trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame

@@ -40 +40 @@
     public override void Run() {
       OptimizerMainForm mainForm = new OptimizerMainForm(typeof(IOptimizerUserInterfaceItemProvider));
-      mainForm.ShowViewsInViewHost = true;
+      mainForm.ShowContentInViewHost = true;
       Application.Run(mainForm);
     }

trunk/sources/HeuristicLab.Optimizer/3.3/OptimizerMainForm.cs

@@ -53 +53 @@
       waitingCursors = 0;
     }
-    public OptimizerMainForm(Type userInterfaceItemType, bool showViewsInViewHost)
+    public OptimizerMainForm(Type userInterfaceItemType, bool showContentInViewHost)
       : this(userInterfaceItemType) {
-      this.ShowViewsInViewHost = showViewsInViewHost;
+      this.ShowContentInViewHost = showContentInViewHost;
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -118 +118 @@
     private void samplesListView_DoubleClick(object sender, EventArgs e) {
       if (samplesListView.SelectedItems.Count == 1)
-        MainFormManager.CreateDefaultView(((IItem)samplesListView.SelectedItems[0].Tag).Clone()).Show();
+        MainFormManager.MainForm.ShowContent((IContent)((IItem)samplesListView.SelectedItems[0].Tag).Clone());
     }
     private void samplesListView_ItemDrag(object sender, ItemDragEventArgs e) {