fix(archicad): Archicad nullable levels fix (#3032)

* archicad level is null * Fixing braces & throw Coding standards now ask for {} around single code blocks after If and other areas where single line is acceptable. Also the if in this case does not need to have an else, as it can just throw if the IF is not entered. --------- Co-authored-by: József L. Kiss <> Co-authored-by: Ian Hawley <[email protected]>
specklesystems · Nov 9, 2023 · e5c7023 · e5c7023
1 parent 13b153e
commit e5c7023
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/Objects/Objects/BuiltElements/Beam.cs b/Objects/Objects/BuiltElements/Beam.cs
@@ -141,10 +141,12 @@ public override Level? level
       get => archicadLevel;
       internal set
       {
-        if (value is not ArchicadLevel l)
-          throw new ArgumentException($"Expected object of type {nameof(ArchicadLevel)}");
+        if (value is ArchicadLevel or null)
+        {
+          archicadLevel = value as ArchicadLevel;
+        }
 
-        archicadLevel = l;
+        throw new ArgumentException($"Expected object of type {nameof(ArchicadLevel)}");
       }
     }
 

diff --git a/Objects/Objects/BuiltElements/Column.cs b/Objects/Objects/BuiltElements/Column.cs
@@ -167,10 +167,12 @@ public override Level? level
       get => archicadLevel;
       internal set
       {
-        if (value is not ArchicadLevel l)
-          throw new ArgumentException($"Expected object of type {nameof(ArchicadLevel)}");
+        if (value is ArchicadLevel or null)
+        {
+          archicadLevel = value as ArchicadLevel;
+        }
 
-        archicadLevel = l;
+        throw new ArgumentException($"Expected object of type {nameof(ArchicadLevel)}");
       }
     }
 

diff --git a/Objects/Objects/BuiltElements/Floor.cs b/Objects/Objects/BuiltElements/Floor.cs
@@ -103,10 +103,12 @@ public override Level? level
       get => archicadLevel;
       internal set
       {
-        if (value is not ArchicadLevel l)
-          throw new ArgumentException($"Expected object of type {nameof(ArchicadLevel)}");
+        if (value is ArchicadLevel or null)
+        {
+          archicadLevel = value as ArchicadLevel;
+        }
 
-        archicadLevel = l;
+        throw new ArgumentException($"Expected object of type {nameof(ArchicadLevel)}");
       }
     }
 

diff --git a/Objects/Objects/BuiltElements/Roof.cs b/Objects/Objects/BuiltElements/Roof.cs
@@ -153,10 +153,12 @@ public override Level? level
       get => archicadLevel;
       internal set
       {
-        if (value is not ArchicadLevel l)
-          throw new ArgumentException($"Expected object of type {nameof(ArchicadLevel)}");
+        if (value is ArchicadLevel or null)
+        {
+          archicadLevel = value as ArchicadLevel;
+        }
 
-        archicadLevel = l;
+        throw new ArgumentException($"Expected object of type {nameof(ArchicadLevel)}");
       }
     }
 

diff --git a/Objects/Objects/BuiltElements/Wall.cs b/Objects/Objects/BuiltElements/Wall.cs
@@ -308,10 +308,12 @@ public override Level? level
       get => archicadLevel;
       internal set
       {
-        if (value is not ArchicadLevel l)
-          throw new ArgumentException($"Expected object of type {nameof(ArchicadLevel)}");
+        if (value is ArchicadLevel or null)
+        {
+          archicadLevel = value as ArchicadLevel;
+        }
 
-        archicadLevel = l;
+        throw new ArgumentException($"Expected object of type {nameof(ArchicadLevel)}");
       }
     }