Some "Codacy Static Code Analysis — 4 new issues (0 max.) of at least minor severity." solved

Author: sweiland-openrails

Source/RunActivity/Viewer3D/Popups/OutOfFocusWindow.cs

@@ -39,19 +39,9 @@ public OutOfFocusWindow(WindowManager owner) : base(owner)
             Height = owner.Viewer.GraphicsDevice.Viewport.Height;
         }
 
-        public override void Draw(SpriteBatch SpriteBatch)
+        private float ConvertToRadiansFromDegrees(int angle)
         {
-            // top
-            DrawLine(SpriteBatch, 0, 0, Width, Thickness, 0);
-
-            // bottom
-            DrawLine(SpriteBatch, 0, Height - Thickness, Width, Thickness, 0);
-
-            // left
-            DrawLine(SpriteBatch, Thickness, Thickness, Height, Thickness, 90);
-
-            // right
-            DrawLine(SpriteBatch, Width, Thickness, Height, Thickness, 90);
+            return (float)((System.Math.PI / 180) * angle);
         }
 
         private void DrawLine(SpriteBatch SpriteBatch, int X, int Y, int width, int height, int degrees)
@@ -61,14 +51,24 @@ private void DrawLine(SpriteBatch SpriteBatch, int X, int Y, int width, int heig
                 new Rectangle(X, Y, width, height),
                 null,
                 Color,
-                (float)ConvertToRadiansFromDegrees(degrees),
+                ConvertToRadiansFromDegrees(degrees),
                 new Vector2(0, 0),
                 SpriteEffects.None, 0);
-         }
+        }
 
-        private float ConvertToRadiansFromDegrees(int angle)
+        public override void Draw(SpriteBatch SpriteBatch)
         {
-            return (float)((System.Math.PI / 180) * angle);
+            // top
+            DrawLine(SpriteBatch, 0, 0, Width, Thickness, 0);
+
+            // bottom
+            DrawLine(SpriteBatch, 0, Height - Thickness, Width, Thickness, 0);
+
+            // left
+            DrawLine(SpriteBatch, Thickness, Thickness, Height, Thickness, 90);
+
+            // right
+            DrawLine(SpriteBatch, Width, Thickness, Height, Thickness, 90);
         }
     }
 }

Source/RunActivity/Viewer3D/Popups/Window.cs

@@ -45,7 +45,7 @@ public abstract class Window : RenderPrimitive
         VertexBuffer WindowVertexBuffer;
         IndexBuffer WindowIndexBuffer;
 
-        readonly bool DoNotDisplayWindow = false;
+        readonly bool DoNotDisplayWindow;
 
         public Window(WindowManager owner, int width, int height, string caption)
         {
@@ -65,10 +65,11 @@ public Window(WindowManager owner, int width, int height, string caption)
             }
 
             Caption = caption;
+            DoNotDisplayWindow = false;
             Owner.Add(this);
         }
 
-        public Window(WindowManager owner)
+        protected Window(WindowManager owner)
         {
             Owner = owner;
             DoNotDisplayWindow = true;