Changeset 10893 for stable

Timestamp:

05/27/14 08:35:48 (10 years ago)

Author:

gkronber

Message:

#2104 merged r10498 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.cs (modified) (2 diffs)

stable/HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.cs

@@ -86 +86 @@
     protected override void OnClosing(CancelEventArgs e) {
       base.OnClosing(e);
-      if (MainFormManager.MainForm.Views.OfType<IContentView>().FirstOrDefault() != null) {
+      if (MainFormManager.MainForm.Views.OfType<IContentView>().Any(v=>v.Content is IStorableContent)) {
         if (MessageBox.Show(this, "Some views are still opened. If their content has not been saved, it will be lost after closing. Do you really want to close HeuristicLab Optimizer?", "Close Optimizer", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1) == DialogResult.No)
           e.Cancel = true;
@@ -110 +110 @@
       else {
         IContentView activeView = ActiveView as IContentView;
-        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
+        if ((activeView != null) && (activeView.Content is IStorableContent)) {
           IStorableContent content = (IStorableContent)activeView.Content;
           Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";

stable/HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.cs

@@ -86 +86 @@
     protected override void OnClosing(CancelEventArgs e) {
       base.OnClosing(e);
-      if (MainFormManager.MainForm.Views.OfType<IContentView>().FirstOrDefault() != null) {
+      if (MainFormManager.MainForm.Views.OfType<IContentView>().Any(v => v.Content is IStorableContent)) {
         if (MessageBox.Show(this, "Some views are still opened. If their content has not been saved, it will be lost after closing. Do you really want to close HeuristicLab Optimizer?", "Close Optimizer", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1) == DialogResult.No)
           e.Cancel = true;
@@ -110 +110 @@
       else {
         IContentView activeView = ActiveView as IContentView;
-        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
+        if ((activeView != null) && (activeView.Content is IStorableContent)) {
           IStorableContent content = (IStorableContent)activeView.Content;
           Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";

stable/HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.cs

@@ -86 +86 @@
     protected override void OnClosing(CancelEventArgs e) {
       base.OnClosing(e);
-      if (MainFormManager.MainForm.Views.OfType<IContentView>().FirstOrDefault() != null) {
+      if (MainFormManager.MainForm.Views.OfType<IContentView>().Any(v => v.Content is IStorableContent)) {
         if (MessageBox.Show(this, "Some views are still opened. If their content has not been saved, it will be lost after closing. Do you really want to close HeuristicLab Optimizer?", "Close Optimizer", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1) == DialogResult.No)
           e.Cancel = true;
@@ -110 +110 @@
       else {
         IContentView activeView = ActiveView as IContentView;
-        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
+        if ((activeView != null) && (activeView.Content is IStorableContent)) {
           IStorableContent content = (IStorableContent)activeView.Content;
           Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";