Merge pull request #101 from arup-group/task/OGH-12-Create-interface-IExpirableComponent

OGH-12-Create-interface-IExpirableComponent

Author: tlmnrnhrdt

OasysGH/Components/GH_OasysDropDownComponent.cs

@@ -3,9 +3,8 @@
 using Grasshopper.Kernel;
 
 namespace OasysGH.Components {
-  public abstract class GH_OasysDropDownComponent : GH_OasysComponent, IGH_VariableParameterComponent {
-    public bool Expire = true;
-
+  public abstract class GH_OasysDropDownComponent : GH_OasysComponent, IGH_VariableParameterComponent, IExpirableComponent {
+    public bool Expire { get; set; } = true;
     protected internal List<List<string>> _dropDownItems;
     protected internal bool _isInitialised = false;
     protected internal List<string> _selectedItems;

OasysGH/Components/GH_OasysTaskCapableComponent.cs

@@ -2,8 +2,8 @@
 using OasysGH.Helpers;
 
 namespace OasysGH.Components {
-  public abstract class GH_OasysTaskCapableComponent<T> : GH_TaskCapableComponent<T> {
-    public bool Expire = true;
+  public abstract class GH_OasysTaskCapableComponent<T> : GH_TaskCapableComponent<T>, IExpirableComponent {
+    public bool Expire { get; set; } = true;
     public abstract OasysPluginInfo PluginInfo { get; }
 
     public GH_OasysTaskCapableComponent(string name, string nickname, string description, string category, string subCategory) : base(name, nickname, description, category, subCategory) {

OasysGH/Components/IExpirableComponent.cs

@@ -0,0 +1,7 @@
+using Grasshopper.Kernel;
+
+namespace OasysGH.Components {
+  public interface IExpirableComponent : IGH_DocumentObject {
+    bool Expire { get; set; }
+  }
+}

OasysGH/UI/DropDownCheckBoxesComponentAttributes.cs

@@ -120,7 +120,7 @@ public DropDownCheckBoxesComponentAttributes(GH_Component owner, Action<int, int
     // booleans for each check box
 
     public override GH_ObjectResponse RespondToMouseDown(GH_Canvas sender, GH_CanvasMouseEvent e) {
-      var comp = Owner as GH_OasysDropDownComponent;
+      var comp = Owner as IExpirableComponent;
       comp.Expire = false;
 
       if (e.Button == System.Windows.Forms.MouseButtons.Left) {
@@ -146,7 +146,7 @@ public override GH_ObjectResponse RespondToMouseDown(GH_Canvas sender, GH_Canvas
     }
 
     public override GH_ObjectResponse RespondToMouseMove(GH_Canvas sender, GH_CanvasMouseEvent e) {
-      var comp = Owner as GH_OasysDropDownComponent;
+      var comp = Owner as IExpirableComponent;
       comp.Expire = false;
 
       if (_drag) {
@@ -180,7 +180,7 @@ public override GH_ObjectResponse RespondToMouseMove(GH_Canvas sender, GH_Canvas
     }
 
     public override GH_ObjectResponse RespondToMouseUp(GH_Canvas sender, GH_CanvasMouseEvent e) {
-      var comp = Owner as GH_OasysDropDownComponent;
+      var comp = Owner as IExpirableComponent;
       comp.Expire = false;
 
       if (e.Button == MouseButtons.Left) {

OasysGH/UI/DropDownComponentAttributes.cs

@@ -100,7 +100,7 @@ public DropDownComponentAttributes(GH_Component owner, Action<int, int> clickHan
     // list of bools for unfolded or closed dropdown
 
     public override GH_ObjectResponse RespondToMouseDown(GH_Canvas sender, GH_CanvasMouseEvent e) {
-      var comp = Owner as GH_OasysDropDownComponent;
+      var comp = Owner as IExpirableComponent;
       comp.Expire = false;
 
       for (int i = 0; i < _dropdownlists.Count; i++) {
@@ -124,7 +124,7 @@ public override GH_ObjectResponse RespondToMouseDown(GH_Canvas sender, GH_Canvas
     }
 
     public override GH_ObjectResponse RespondToMouseMove(GH_Canvas sender, GH_CanvasMouseEvent e) {
-      var comp = Owner as GH_OasysDropDownComponent;
+      var comp = Owner as IExpirableComponent;
       comp.Expire = false;
 
       if (_drag) {
@@ -158,7 +158,7 @@ public override GH_ObjectResponse RespondToMouseMove(GH_Canvas sender, GH_Canvas
     }
 
     public override GH_ObjectResponse RespondToMouseUp(GH_Canvas sender, GH_CanvasMouseEvent e) {
-      var comp = Owner as GH_OasysDropDownComponent;
+      var comp = Owner as IExpirableComponent;
       comp.Expire = false;
 
       if (e.Button == MouseButtons.Left) {

OasysGH/UI/DropDownSliderComponentAttributes.cs

@@ -131,7 +131,7 @@ public DropDownSliderComponentAttributes(GH_Component owner, Action<int, int> cl
     // list of bools for unfolded or closed dropdown
 
     public override GH_ObjectResponse RespondToMouseDoubleClick(GH_Canvas sender, GH_CanvasMouseEvent e) {
-      var comp = Owner as GH_OasysDropDownComponent;
+      var comp = Owner as IExpirableComponent;
       comp.Expire = false;
 
       RectangleF rec = _grabBound;
@@ -167,7 +167,7 @@ public override GH_ObjectResponse RespondToMouseDoubleClick(GH_Canvas sender, GH
     }
 
     public override GH_ObjectResponse RespondToMouseDown(GH_Canvas sender, GH_CanvasMouseEvent e) {
-      var comp = Owner as GH_OasysDropDownComponent;
+      var comp = Owner as IExpirableComponent;
       comp.Expire = false;
 
       if (e.Button == MouseButtons.Left) {
@@ -203,7 +203,7 @@ public override GH_ObjectResponse RespondToMouseDown(GH_Canvas sender, GH_Canvas
     }
 
     public override GH_ObjectResponse RespondToMouseMove(GH_Canvas sender, GH_CanvasMouseEvent e) {
-      var comp = Owner as GH_OasysDropDownComponent;
+      var comp = Owner as IExpirableComponent;
       comp.Expire = false;
 
       if (_dragY) {
@@ -256,7 +256,7 @@ public override GH_ObjectResponse RespondToMouseMove(GH_Canvas sender, GH_Canvas
     }
 
     public override GH_ObjectResponse RespondToMouseUp(GH_Canvas sender, GH_CanvasMouseEvent e) {
-      var comp = Owner as GH_OasysDropDownComponent;
+      var comp = Owner as IExpirableComponent;
       comp.Expire = false;
 
       if (e.Button == MouseButtons.Left) {