Merge pull request #2444 from peppy/misc-fixes

Fix new detections in rider 2018.1
ppy · Apr 23, 2018 · 2bd2fac · 2bd2fac
2 parents f0071ea + 1949929
commit 2bd2fac
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/osu.Game/Online/API/Requests/GetMessagesRequest.cs b/osu.Game/Online/API/Requests/GetMessagesRequest.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Online.API.Requests
     public class GetMessagesRequest : APIRequest<List<Message>>
     {
         private readonly List<Channel> channels;
-        private long? since;
+        private readonly long? since;
 
         public GetMessagesRequest(List<Channel> channels, long? sinceId)
         {

diff --git a/osu.Game/Online/API/Requests/GetUserRequest.cs b/osu.Game/Online/API/Requests/GetUserRequest.cs
@@ -7,7 +7,7 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetUserRequest : APIRequest<User>
     {
-        private long? userId;
+        private readonly long? userId;
 
         public GetUserRequest(long? userId = null)
         {

diff --git a/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs b/osu.Game/Screens/Edit/Screens/Compose/Layers/MaskContainer.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
@@ -43,6 +44,8 @@ public MaskContainer()
 
         public override void Add(HitObjectMask drawable)
         {
+            if (drawable == null) throw new ArgumentNullException(nameof(drawable));
+
             base.Add(drawable);
 
             drawable.Selected += onMaskSelected;
@@ -51,8 +54,10 @@ public override void Add(HitObjectMask drawable)
             drawable.DragRequested += onDragRequested;
         }
 
-        public override bool Remove(HitObjectMask drawable)
+        public override bool Remove([NotNull] HitObjectMask drawable)
         {
+            if (drawable == null) throw new ArgumentNullException(nameof(drawable));
+
             var result = base.Remove(drawable);
 
             if (result)

diff --git a/osu.Game/Screens/Ranking/ResultsPageScore.cs b/osu.Game/Screens/Ranking/ResultsPageScore.cs
@@ -223,11 +223,11 @@ private void load(OsuColour colours)
 
         private class DateTimeDisplay : Container
         {
-            private DateTime datetime;
+            private readonly DateTime date;
 
-            public DateTimeDisplay(DateTime datetime)
+            public DateTimeDisplay(DateTime date)
             {
-                this.datetime = datetime;
+                this.date = date;
 
                 AutoSizeAxes = Axes.Y;
 
@@ -251,15 +251,15 @@ private void load(OsuColour colours)
                     {
                         Origin = Anchor.CentreLeft,
                         Anchor = Anchor.CentreLeft,
-                        Text = datetime.ToShortDateString(),
+                        Text = date.ToShortDateString(),
                         Padding = new MarginPadding { Horizontal = 10, Vertical = 5 },
                         Colour = Color4.White,
                     },
                     new OsuSpriteText
                     {
                         Origin = Anchor.CentreRight,
                         Anchor = Anchor.CentreRight,
-                        Text = datetime.ToShortTimeString(),
+                        Text = date.ToShortTimeString(),
                         Padding = new MarginPadding { Horizontal = 10, Vertical = 5 },
                         Colour = Color4.White,
                     }