Changeset 3412 for trunk/sources

Timestamp:

04/19/10 17:21:14 (15 years ago)

Author:

mkommend

Message:

adapted contents according to discussions with swa (ticket #980)

Location:

trunk/sources/HeuristicLab.Common/3.3/Content

Files:

• Content.cs (modified) (1 diff)
• IContent.cs (modified) (1 diff)
• IStorableContent.cs (modified) (2 diffs)
• StorableContent.cs (modified) (5 diffs)

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

@@ -27 +27 @@
 namespace HeuristicLab.Common {
   public class Content : DeepCloneable, IContent {
-    public Content() {
-      this.readOnlyView = false;
-    }
-    public Content(bool readOnlyView)
-      : this() {
-      this.ReadOnlyView = readOnlyView;
-    }
-
-    private bool readOnlyView;
-    public virtual bool ReadOnlyView {
-      get { return readOnlyView; }
-      set {
-        if (readOnlyView != value) {
-          readOnlyView = value;
-          OnReadOnlyViewChanged();
-        }
-      }
-    }
-    public event EventHandler ReadOnlyViewChanged;
-    protected virtual void OnReadOnlyViewChanged() {
-      EventHandler handler = ReadOnlyViewChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
+    public Content()
+      : base() {
     }
   }

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

@@ -26 +26 @@
 
 namespace HeuristicLab.Common {
-  public interface IContent :IDeepCloneable{
-    bool ReadOnlyView { get; set; }
-
-    event EventHandler ReadOnlyViewChanged;
+  public interface IContent{
   }
 }

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

@@ -28 +28 @@
   public interface IStorableContent : IContent {
     string Filename { get; set; }
-    bool SaveEnabled { get; set; }
 
     void Save();
@@ -36 +35 @@
 
     event EventHandler FilenameChanged;
-    event EventHandler SaveEnabledChanged;
     event EventHandler SaveOperationStarted;
     event EventHandler<EventArgs<Exception>> SaveOperationFinished;

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

@@ -32 +32 @@
       : base() {
       this.filename = string.Empty;
-      this.saveEnabled = true;
     }
-    public StorableContent(bool saveEnabled)
-      : this() {
-      this.saveEnabled = saveEnabled;
-      //NOTE: important do not call propagate changes, because derived objects are not constructed
-    }
-    public StorableContent(bool saveEnabled, string filename)
-      : this(saveEnabled) {
+    public StorableContent(string filename)
+      : base() {
       this.Filename = filename;
     }
@@ -55 +49 @@
     }
 
-    private bool saveEnabled;
-    public virtual bool SaveEnabled {
-      get { return this.saveEnabled; }
-      set {
-        if (this.saveEnabled != value) {
-          this.saveEnabled = value;
-          this.PropagateSaveEnabledChanges();
-          this.OnSaveEnabledChanged();
-        }
-      }
-    }
-
-    protected void PropagateSaveEnabledChanges() {
-      Type type = this.GetType();
-      foreach (FieldInfo fieldInfo in type.GetFields(BindingFlags.Default)) {
-        if (typeof(IStorableContent).IsAssignableFrom(fieldInfo.GetType())) {
-          IStorableContent storableContent = (IStorableContent)fieldInfo.GetValue(this);
-          storableContent.SaveEnabled = this.saveEnabled;
-        }
-      }
-    }
-
     protected abstract void Save();
     void IStorableContent.Save() {
-      if (this.SaveEnabled) {
-        this.OnSaveOperationStarted();
+      this.OnSaveOperationStarted();
+      Exception ex = null;
+      try {
         this.Save();
-        this.OnSaveOperationFinished(null);
       }
+      catch (Exception e) {
+        ex = e;
+      }
+      this.OnSaveOperationFinished(ex);
     }
     public void Save(string filename) {
@@ -93 +69 @@
       ThreadPool.QueueUserWorkItem(
         new WaitCallback(delegate(object arg) {
-        try { this.Save(); }
-        catch (Exception ex) {
-          this.OnSaveOperationFinished(ex);
-        }
+        this.Save();
       })
       );
@@ -115 +88 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-    public event EventHandler SaveEnabledChanged;
-    protected virtual void OnSaveEnabledChanged() {
-      EventHandler handler = SaveEnabledChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
     public event EventHandler SaveOperationStarted;
     protected virtual void OnSaveOperationStarted() {
@@ -130 +98 @@
       if (handler != null) handler(this, new EventArgs<Exception>(ex));
     }
-
   }
 }