Changeset 3483 for trunk/sources/HeuristicLab.Common/3.3/Content/StorableContent.cs

Timestamp:

04/22/10 05:14:39 (14 years ago)

Author:

swagner

Message:

Worked on the refactoring of saving and loading items (#990)

File:

• trunk/sources/HeuristicLab.Common/3.3/Content/StorableContent.cs (modified) (2 diffs)

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Reflection;
 
 namespace HeuristicLab.Common {
-  public abstract class StorableContent : Content, IStorableContent {
-    public StorableContent()
-      : base() {
-      this.filename = string.Empty;
-    }
-    public StorableContent(string filename)
-      : base() {
-      this.Filename = filename;
-    }
-
+  public class StorableContent : IStorableContent {
     private string filename;
     public string Filename {
-      get { return this.filename; }
+      get { return filename; }
       set {
-        if (this.filename != value) {
-          this.filename = value;
-          this.OnFilenameChanged();
+        if (!filename.Equals(value)) {
+          filename = value;
+          OnFilenameChanged();
         }
       }
     }
 
-    protected abstract void Save();
-    void IStorableContent.Save() {
-      this.OnSaveOperationStarted();
-      Exception ex = null;
-      try {
-        this.Save();
-      }
-      catch (Exception e) {
-        ex = e;
-      }
-      this.OnSaveOperationFinished(ex);
-    }
-    public void Save(string filename) {
-      this.Filename = filename;
-      ((IStorableContent)this).Save();
-    }
-
-    protected virtual void SaveAsnychronous() {
-      ThreadPool.QueueUserWorkItem(
-        new WaitCallback(delegate(object arg) {
-        this.Save();
-      })
-      );
-    }
-    void IStorableContent.SaveAsynchronous() {
-      this.OnSaveOperationStarted();
-      this.SaveAsnychronous();
-      this.OnSaveOperationFinished(null);
-    }
-    public void SaveAsynchronous(string filename) {
-      this.Filename = filename;
-      ((IStorableContent)this).SaveAsynchronous();
+    public StorableContent() {
+      filename = string.Empty;
     }
 
@@ -88 +44 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-    public event EventHandler SaveOperationStarted;
-    protected virtual void OnSaveOperationStarted() {
-      EventHandler handler = SaveOperationStarted;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler<EventArgs<Exception>> SaveOperationFinished;
-    protected virtual void OnSaveOperationFinished(Exception ex) {
-      EventHandler<EventArgs<Exception>> handler = SaveOperationFinished;
-      if (handler != null) handler(this, new EventArgs<Exception>(ex));
-    }
   }
 }