Changeset 5270 for trunk/sources

Timestamp:

01/11/11 12:00:36 (13 years ago)

Author:

mkommend

Message:

Implemented ShowContent method in MainForm which reuses existing views and adapted the ClipBoard (ticket #1372).

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/Clipboard.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForm.cs (modified) (3 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs (modified) (1 diff)

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

@@ -260 +260 @@
       if (listView.SelectedItems.Count == 1) {
         T item = (T)listView.SelectedItems[0].Tag;
-        IContentView view;
-        view = MainFormManager.MainForm.Views.OfType<IContentView>().Where(x => (x.Content != null) && (x.Content == item)).FirstOrDefault();
-        if (view != null) {
-          view.Show();
-        } else {
-          view = MainFormManager.MainForm.ShowContent(item);
-          if (view != null) {
-            view.ReadOnly = this.ReadOnly;
-          }
-        }
+        IContentView view = MainFormManager.MainForm.ShowContent(item, true);
       }
     }

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

@@ -21 +21 @@
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -220 +219 @@
 
     public IContentView ShowContent(IContent content) {
-      if (content == null)
-        throw new ArgumentNullException("Content cannot be null.");
+      if (content == null) throw new ArgumentNullException("Content cannot be null.");
       Type viewType = MainFormManager.GetDefaultViewType(content.GetType());
-      if (viewType != null)
-        return ShowContent(content, viewType);
+      if (viewType != null) return ShowContent(content, viewType);
       return null;
+    }
+
+    public IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class,IContent {
+      if (content == null) throw new ArgumentNullException("Content cannot be null.");
+      if (!reuseExistingView) return ShowContent(content);
+
+      IContentView view = null;
+      if (comparer == null) view = Views.OfType<IContentView>().Where(v => (v.Content as T) == content).FirstOrDefault();
+      else view = Views.OfType<IContentView>().Where(v => comparer.Equals((v.Content as T), content)).FirstOrDefault();
+
+      if (view == null) view = ShowContent(content);
+      else view.Show();
+
+      return view;
     }
 
@@ -231 +242 @@
       if (InvokeRequired) return (IContentView)Invoke((Func<IContent, Type, IContentView>)ShowContent, content, viewType);
       else {
-        if (content == null)
-          throw new ArgumentNullException("Content cannot be null.");
-        if (viewType == null)
-          throw new ArgumentNullException("ViewType cannot be null.");
-
-        IContentView view;
-        if (this.ShowContentInViewHost) {
+        if (content == null) throw new ArgumentNullException("Content cannot be null.");
+        if (viewType == null) throw new ArgumentNullException("ViewType cannot be null.");
+
+        IContentView view = null;
+        if (ShowContentInViewHost) {
           ViewHost viewHost = new ViewHost();
           viewHost.ViewType = viewType;
           view = viewHost;
-        } else
-          view = MainFormManager.CreateView(viewType);
+
+        } else view = MainFormManager.CreateView(viewType);
 
         view.Content = content;

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

@@ -108 +108 @@
       get { return viewType; }
       set {
-        if (viewType != value) {
+        if (viewType != value && value.GetType() != typeof(ViewHost)) {
           if (value != null && Content != null && !ViewCanShowContent(value, Content))
             throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".",

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

@@ -39 +39 @@
 
     IContentView ShowContent(IContent content);
+    IContentView ShowContent<T>(T content, bool reuseExistingView, IEqualityComparer<T> comparer = null) where T : class,IContent;
     IContentView ShowContent(IContent content, Type viewType);