Changeset 3500

Timestamp:

04/22/10 23:33:13 (14 years ago)

Author:

swagner

Message:

Finished refactoring of saving and loading items (#990)

Location:

trunk/sources

Files:

• HeuristicLab.Common/3.2/Content/ContentManager.cs (modified) (1 diff)
• HeuristicLab.Common/3.2/Content/IStorableContent.cs (modified) (1 diff)
• HeuristicLab.Common/3.2/Content/StorableContent.cs (modified) (1 diff)
• HeuristicLab.Common/3.3/Content/ContentManager.cs (modified) (1 diff)
• HeuristicLab.Common/3.3/Content/IStorableContent.cs (modified) (1 diff)
• HeuristicLab.Common/3.3/Content/StorableContent.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/IItem.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/BatchRunView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/FileManager.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Common/3.2/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(content, filename, compressed);
+      instance.SaveContent((IStorableContent)content.Clone(), 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.Common/3.2/Content/IStorableContent.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Common {
-  public interface IStorableContent : IContent {
+  public interface IStorableContent : IContent, IDeepCloneable {
     string Filename { get; set; }
 

trunk/sources/HeuristicLab.Common/3.2/Content/StorableContent.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Common {
-  public class StorableContent : IStorableContent {
+  public class StorableContent : DeepCloneable, IStorableContent {
     private string filename;
     public string Filename {

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(content, filename, compressed);
+      instance.SaveContent((IStorableContent)content.Clone(), 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.Common/3.3/Content/IStorableContent.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Common {
-  public interface IStorableContent : IContent {
+  public interface IStorableContent : IContent, IDeepCloneable {
     string Filename { get; set; }
 

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

@@ -23 +23 @@
 
 namespace HeuristicLab.Common {
-  public class StorableContent : IStorableContent {
+  public class StorableContent : DeepCloneable, IStorableContent {
     private string filename;
     public string Filename {

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IItem.cs

@@ -28 +28 @@
   /// Interface to represent (almost) every HeuristicLab object (an object, an operator,...).
   /// </summary>
-  public interface IItem : IStorableContent, IDeepCloneable {
+  public interface IItem : IStorableContent {
     string ItemName { get; }
     string ItemDescription { get; }

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

@@ -187 +187 @@
       openFileDialog.Title = "Open Problem";
       if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
-        this.Cursor = Cursors.AppStarting;
         newProblemButton.Enabled = openProblemButton.Enabled = false;
         problemViewHost.Enabled = false;
 
-        var call = new Func<string, object>(XmlParser.Deserialize);
-        call.BeginInvoke(openFileDialog.FileName, delegate(IAsyncResult a) {
-          IProblem problem = null;
+        ContentManager.LoadAsync(openFileDialog.FileName, delegate(IStorableContent content, Exception error) {
           try {
-            problem = call.EndInvoke(a) as IProblem;
-          } catch (Exception ex) {
-            Auxiliary.ShowErrorMessageBox(ex);
-          }
-          Invoke(new Action(delegate() {
+            if (error != null) throw error;
+            IProblem problem = content as IProblem;
             if (problem == null)
               MessageBox.Show(this, "The selected file does not contain a problem.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -206 +200 @@
             else
               Content.Problem = problem;
-            problemViewHost.Enabled = true;
-            newProblemButton.Enabled = openProblemButton.Enabled = true;
-            this.Cursor = Cursors.Default;
-          }));
-        }, null);
+          }
+          catch (Exception ex) {
+            Auxiliary.ShowErrorMessageBox(ex);
+          }
+          finally {
+            Invoke(new Action(delegate() {
+              problemViewHost.Enabled = true;
+              newProblemButton.Enabled = openProblemButton.Enabled = true;
+            }));
+          }
+        });
       }
     }

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

@@ -174 +174 @@
       openFileDialog.Title = "Open Algorithm";
       if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
-        this.Cursor = Cursors.AppStarting;
         newAlgorithmButton.Enabled = openAlgorithmButton.Enabled = false;
         algorithmViewHost.Enabled = false;
 
-        var call = new Func<string, object>(XmlParser.Deserialize);
-        call.BeginInvoke(openFileDialog.FileName, delegate(IAsyncResult a) {
-          IAlgorithm algorithm = null;
+        ContentManager.LoadAsync(openFileDialog.FileName, delegate(IStorableContent content, Exception error) {
           try {
-            algorithm = call.EndInvoke(a) as IAlgorithm;
-          } catch (Exception ex) {
-            Auxiliary.ShowErrorMessageBox(ex);
-          }
-          Invoke(new Action(delegate() {
+            if (error != null) throw error;
+            IAlgorithm algorithm = content as IAlgorithm;
             if (algorithm == null)
               MessageBox.Show(this, "The selected file does not contain an algorithm.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
             else
               Content.Algorithm = algorithm;
-            algorithmViewHost.Enabled = true;
-            newAlgorithmButton.Enabled = openAlgorithmButton.Enabled = true;
-            this.Cursor = Cursors.Default;
-          }));
-        }, null);
+          }
+          catch (Exception ex) {
+            Auxiliary.ShowErrorMessageBox(ex);
+          }
+          finally {
+            Invoke(new Action(delegate() {
+              algorithmViewHost.Enabled = true;
+              newAlgorithmButton.Enabled = openAlgorithmButton.Enabled = true;
+            }));
+          }
+        });
       }
     }

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

@@ -80 +80 @@
       openFileDialog.Title = "Open Operator Graph";
       if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
-        this.Cursor = Cursors.AppStarting;
         newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = false;
         operatorGraphViewHost.Enabled = false;
 
-        var call = new Func<string, object>(XmlParser.Deserialize);
-        call.BeginInvoke(openFileDialog.FileName, delegate(IAsyncResult a) {
-          OperatorGraph operatorGraph = null;
+        ContentManager.LoadAsync(openFileDialog.FileName, delegate(IStorableContent content, Exception error) {
           try {
-            operatorGraph = call.EndInvoke(a) as OperatorGraph;
+            if (error != null) throw error;
+            OperatorGraph operatorGraph = content as OperatorGraph;
+            if (operatorGraph == null)
+              MessageBox.Show(this, "The selected file does not contain an operator graph.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            else
+              Content.OperatorGraph = operatorGraph;
           }
           catch (Exception ex) {
             Auxiliary.ShowErrorMessageBox(ex);
           }
-          Invoke(new Action(delegate() {
-            if (operatorGraph == null)
-              MessageBox.Show(this, "The selected file does not contain an operator graph.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            else
-              Content.OperatorGraph = operatorGraph;
-            operatorGraphViewHost.Enabled = true;
-            newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = true;
-            this.Cursor = Cursors.Default;
-          }));
-        }, null);
+          finally {
+            Invoke(new Action(delegate() {
+              operatorGraphViewHost.Enabled = true;
+              newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = true;
+            }));
+          }
+        });
       }
     }

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

@@ -95 +95 @@
         else {
           ((OptimizerMainForm)MainFormManager.MainForm).SetAppStartingCursor();
-          ((Form)MainFormManager.MainForm).Enabled = false;
           ContentManager.SaveAsync(content, content.Filename, true, SavingCompleted);
         }
@@ -120 +119 @@
         if (saveFileDialog.ShowDialog() == DialogResult.OK) {
           ((OptimizerMainForm)MainFormManager.MainForm).SetAppStartingCursor();
-          ((Form)MainFormManager.MainForm).Enabled = false;
           if (saveFileDialog.FilterIndex == 1) {
             ContentManager.SaveAsync(content, saveFileDialog.FileName, false, SavingCompleted);
@@ -134 +132 @@
         Invoke(delegate() {
           ((OptimizerMainForm)MainFormManager.MainForm).UpdateTitle();
-          ((Form)MainFormManager.MainForm).Enabled = true;
         });
       }