Changeset 2712

Timestamp:

01/29/10 01:41:59 (15 years ago)

Author:

swagner

Message:

Worked on ContentView (#857)

• added interface IContentView
• renamed RegisterObjectEvents and DeregisterObjectEvents to RegisterContentEvents and DeregisterContentEvents
• removed EventArgs parameter from OnContentChanged
• called DeregisterContentEvents in Dispose to remove content events correctly

Location:

trunk/sources

Files:

• HeuristicLab.MainForm.WindowsForms/3.2/ContentView.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/ContentView.cs (modified) (5 diffs)
• HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IContentView.cs (added)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ContentView.Designer.cs

@@ -11 +11 @@
     /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
     protected override void Dispose(bool disposing) {
-      if (disposing && (components != null)) {
-        components.Dispose();
+      if (disposing) {
+        if (Content != null) DeregisterContentEvents();
+        if (components != null) components.Dispose();
       }
       base.Dispose(disposing);

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.2/ContentView.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  public partial class ContentView : View {
+  public partial class ContentView : View, IContentView {
     public ContentView()
       : base() {
@@ -51 +51 @@
         } else {
           if (this.content != value) {
-            if (this.content != null)
-              this.DeregisterObjectEvents();
+            if (this.content != null) this.DeregisterContentEvents();
             this.content = value;
-            this.OnContentChanged(new EventArgs());
-            if (this.content != null)
-              this.RegisterObjectEvents();
+            this.OnContentChanged();
+            if (this.content != null) this.RegisterContentEvents();
           }
         }
@@ -65 +63 @@
     /// Adds eventhandlers to the current instance.
     /// </summary>
-    protected virtual void RegisterObjectEvents() {
+    protected virtual void RegisterContentEvents() {
     }
 
@@ -71 +69 @@
     /// Removes the eventhandlers from the current instance.
     /// </summary>
-    protected virtual void DeregisterObjectEvents() {
+    protected virtual void DeregisterContentEvents() {
     }
 
@@ -77 +75 @@
     /// Is called when the content property changes.
     /// </summary>
-    protected virtual void OnContentChanged(EventArgs e) {
+    protected virtual void OnContentChanged() {
     }
-
   }
 }

trunk/sources/HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj

@@ -81 +81 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Interfaces\IContentView.cs" />
     <Compile Include="Interfaces\IActionUserInterfaceItem.cs" />
     <Compile Include="Interfaces\IPositionableUserInterfaceItem.cs" />