Changeset 6935

Timestamp:

10/18/11 16:02:58 (13 years ago)

Author:

ascheibe

Message:

#1652 fixed a bug when saving a file in SD or MD mode

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (4 diffs)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (2 diffs)
• HeuristicLab.Optimizer/3.3/OptimizerDockingMainForm.cs (modified) (4 diffs)
• HeuristicLab.Optimizer/3.3/OptimizerMultipleDocumentMainForm.cs (modified) (4 diffs)
• HeuristicLab.Optimizer/3.3/OptimizerSingleDocumentMainForm.cs (modified) (4 diffs)

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -33 +34 @@
     private int appStartingCursors;
     private int waitingCursors;
+    private string title;
 
     protected MainForm()
@@ -176 +178 @@
 
     protected virtual void OnInitialized(EventArgs e) {
+      AssemblyFileVersionAttribute version = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).
+                                             Cast<AssemblyFileVersionAttribute>().FirstOrDefault();
+      title = "HeuristicLab Optimizer";
+      if (version != null) title += " " + version.Version;
+      Title = title;
     }
 
@@ -491 +498 @@
     }
     #endregion
+
+    public virtual void UpdateTitle() {
+      if (InvokeRequired)
+        Invoke(new Action(UpdateTitle));
+      else {
+        IContentView activeView = ActiveView as IContentView;
+        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
+          IStorableContent content = (IStorableContent)activeView.Content;
+          Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";
+        } else {
+          Title = title;
+        }
+      }
+    }
   }
 }

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

@@ -131 +131 @@
         SetEnabledStateOfContentViews(content, true);
         if (error != null) throw error;
-        MainFormManager.GetMainForm<OptimizerDockingMainForm>().UpdateTitle();
+        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().UpdateTitle();
       }
       catch (Exception ex) {
@@ -142 +142 @@
 
     private static void SetEnabledStateOfContentViews(IStorableContent content, bool enabled) {
-      OptimizerDockingMainForm mainForm = MainFormManager.GetMainForm<OptimizerDockingMainForm>();
+      HeuristicLab.MainForm.WindowsForms.MainForm mainForm = MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>();
       if (mainForm.InvokeRequired)
         mainForm.Invoke((Action<IStorableContent, bool>)SetEnabledStateOfContentViews, content, enabled);

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

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -33 +32 @@
 namespace HeuristicLab.Optimizer {
   internal partial class OptimizerDockingMainForm : DockingMainForm {
-    private string title;
 
     private Clipboard<IItem> clipboard;
@@ -55 +53 @@
     protected override void OnInitialized(EventArgs e) {
       base.OnInitialized(e);
-      AssemblyFileVersionAttribute version = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).
-                                             Cast<AssemblyFileVersionAttribute>().FirstOrDefault();
-      title = "HeuristicLab Optimizer";
-      if (version != null) title += " " + version.Version;
-      Title = title;
 
       ContentManager.Initialize(new PersistenceContentManager());
@@ -103 +96 @@
       UpdateTitle();
     }
-
-    public void UpdateTitle() {
-      if (InvokeRequired)
-        Invoke(new Action(UpdateTitle));
-      else {
-        IContentView activeView = ActiveView as IContentView;
-        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
-          IStorableContent content = (IStorableContent)activeView.Content;
-          Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";
-        } else {
-          Title = title;
-        }
-      }
-    }
   }
 }

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

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -33 +32 @@
 namespace HeuristicLab.Optimizer {
   internal partial class OptimizerMultipleDocumentMainForm : MultipleDocumentMainForm {
-    private string title;
 
     private Clipboard<IItem> clipboard;
@@ -55 +53 @@
     protected override void OnInitialized(EventArgs e) {
       base.OnInitialized(e);
-      AssemblyFileVersionAttribute version = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).
-                                             Cast<AssemblyFileVersionAttribute>().FirstOrDefault();
-      title = "HeuristicLab Optimizer";
-      if (version != null) title += " " + version.Version;
-      Title = title;
 
       ContentManager.Initialize(new PersistenceContentManager());
@@ -103 +96 @@
       UpdateTitle();
     }
-
-    public void UpdateTitle() {
-      if (InvokeRequired)
-        Invoke(new Action(UpdateTitle));
-      else {
-        IContentView activeView = ActiveView as IContentView;
-        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
-          IStorableContent content = (IStorableContent)activeView.Content;
-          Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";
-        } else {
-          Title = title;
-        }
-      }
-    }
   }
 }

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

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Linq;
-using System.Reflection;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -33 +32 @@
 namespace HeuristicLab.Optimizer {
   internal partial class OptimizerSingleDocumentMainForm : SingleDocumentMainForm {
-    private string title;
 
     private Clipboard<IItem> clipboard;
@@ -55 +53 @@
     protected override void OnInitialized(EventArgs e) {
       base.OnInitialized(e);
-      AssemblyFileVersionAttribute version = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).
-                                             Cast<AssemblyFileVersionAttribute>().FirstOrDefault();
-      title = "HeuristicLab Optimizer";
-      if (version != null) title += " " + version.Version;
-      Title = title;
 
       ContentManager.Initialize(new PersistenceContentManager());
@@ -103 +96 @@
       UpdateTitle();
     }
-
-    public void UpdateTitle() {
-      if (InvokeRequired)
-        Invoke(new Action(UpdateTitle));
-      else {
-        IContentView activeView = ActiveView as IContentView;
-        if ((activeView != null) && (activeView.Content != null) && (activeView.Content is IStorableContent)) {
-          IStorableContent content = (IStorableContent)activeView.Content;
-          Title = title + " [" + (string.IsNullOrEmpty(content.Filename) ? "Unsaved" : content.Filename) + "]";
-        } else {
-          Title = title;
-        }
-      }
-    }
   }
 }