Changeset 4245 for trunk

Timestamp:

08/17/10 16:42:58 (14 years ago)

Author:

mkommend

Message:

Removed cloning of saved contents and refactored FileManager (ticket #1143).

Location:

trunk/sources

Files:

• HeuristicLab.Common/3.3/Content/ContentManager.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Common/3.3/Content/ContentManager.cs

@@ -60 +60 @@
     public static void Save(IStorableContent content, string filename, bool compressed) {
       if (instance == null) throw new InvalidOperationException("ContentManager is not initialized.");
-      instance.SaveContent((IStorableContent)content.Clone(), filename, compressed);
+      instance.SaveContent(content, filename, compressed);
       content.Filename = filename;
     }
     public static void SaveAsync(IStorableContent content, string filename, bool compressed, Action<IStorableContent, Exception> savingCompletedCallback) {
       if (instance == null) throw new InvalidOperationException("ContentManager is not initialized.");
+      var action = new Action<IStorableContent, string, bool>(instance.SaveContent);
+      action.BeginInvoke(content, filename, compressed, delegate(IAsyncResult result) {
+        Exception error = null;
+        try {
+          action.EndInvoke(result);
+          content.Filename = filename;
+        }
+        catch (Exception ex) {
+          error = ex;
+        }
+        savingCompletedCallback(content, error);
+      }, null);
 
-      IStorableContent clone = null;
-      try {
-        clone = (IStorableContent)content.Clone();
-      }
-      catch (Exception ex) {
-        savingCompletedCallback(content, ex);
-      }
-
-      if (clone != null) {
-        var action = new Action<IStorableContent, string, bool>(instance.SaveContent);
-        action.BeginInvoke(clone, filename, compressed, delegate(IAsyncResult result) {
-          Exception error = null;
-          try {
-            action.EndInvoke(result);
-            content.Filename = filename;
-          }
-          catch (Exception ex) {
-            error = ex;
-          }
-          savingCompletedCallback(content, error);
-        }, null);
-      }
     }
     protected abstract void SaveContent(IStorableContent content, string filename, bool compressed);

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

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
@@ -42 +43 @@
       if (newItemDialog.ShowDialog() == DialogResult.OK) {
         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);
+        if (view == null)
+          ErrorHandling.ShowErrorDialog("There is no view for the new item. It cannot be displayed.", new InvalidOperationException("No View Available"));
       }
     }
@@ -66 +68 @@
       try {
         if (error != null) throw error;
-        Invoke(delegate() {
-          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);
-        });
+        IView view = MainFormManager.MainForm.ShowContent(content);
+        if (view == null)
+          ErrorHandling.ShowErrorDialog("There is no view for the loaded item. It cannot be displayed.", new InvalidOperationException("No View Available"));
       }
       catch (Exception ex) {
@@ -87 +88 @@
     private static void Save(IContentView view) {
       IStorableContent content = view.Content as IStorableContent;
-      if (!view.Locked && (content != null)) {
+      if (!view.Locked && content != null) {
         if (string.IsNullOrEmpty(content.Filename))
           SaveAs(view);
         else {
           ((OptimizerMainForm)MainFormManager.MainForm).SetAppStartingCursor();
+          var views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == content).ToList();
+          views.ForEach(v => v.ReadOnly = true);
+          views.ForEach(v => v.Locked = true);
           ContentManager.SaveAsync(content, content.Filename, true, SavingCompleted);
         }
@@ -104 +108 @@
     public static void SaveAs(IContentView view) {
       IStorableContent content = view.Content as IStorableContent;
-      if (!view.Locked && (content != null)) {
+      if (!view.Locked && content != null) {
         if (saveFileDialog == null) {
           saveFileDialog = new SaveFileDialog();
@@ -116 +120 @@
         if (saveFileDialog.ShowDialog() == DialogResult.OK) {
           ((OptimizerMainForm)MainFormManager.MainForm).SetAppStartingCursor();
+          var views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == content).ToList();
+          views.ForEach(v => v.ReadOnly = true);
+          views.ForEach(v => v.Locked = true);
           if (saveFileDialog.FilterIndex == 1) {
             ContentManager.SaveAsync(content, saveFileDialog.FileName, false, SavingCompleted);
@@ -126 +133 @@
     private static void SavingCompleted(IStorableContent content, Exception error) {
       try {
+        var views = MainFormManager.MainForm.Views.OfType<IContentView>().Where(v => v.Content == content).ToList();
+        views.ForEach(v => v.ReadOnly = false);
+        views.ForEach(v => v.Locked = false);
         if (error != null) throw error;
-        Invoke(delegate() {
-          ((OptimizerMainForm)MainFormManager.MainForm).UpdateTitle();
-        });
+        MainFormManager.GetMainForm<OptimizerMainForm>().UpdateTitle();
       }
       catch (Exception ex) {
@@ -138 +146 @@
       }
     }
-
-    private static void Invoke(Action a) {
-      Form form = MainFormManager.MainForm as Form;
-      if (form.InvokeRequired)
-        form.Invoke(a);
-      else
-        a.Invoke();
-    }
   }
 }