Merge pull request #5 from ivandrofly/sdi-patch

Simplify delegate invocation.
RandallFlagg · Sep 5, 2016 · 16fd909 · 16fd909
2 parents 9eea9a9 + 6b63581
commit 16fd909
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 49 deletions.
diff --git a/IdSharp.Tagging/APEv2/APEv2Tag.cs b/IdSharp.Tagging/APEv2/APEv2Tag.cs
@@ -459,9 +459,7 @@ public string Language
 
         private void RaisePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v1/ID3v1Tag.cs b/IdSharp.Tagging/ID3v1/ID3v1Tag.cs
@@ -308,9 +308,7 @@ public void Save(string path)
 
         private void RaisePropertyChanged(string propertyName)
         {
-            var handler = PropertyChanged;
-            if (handler != null)
-                handler(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         /// <summary>

diff --git a/IdSharp.Tagging/ID3v2/Classes/Frame.cs b/IdSharp.Tagging/ID3v2/Classes/Frame.cs
@@ -36,9 +36,7 @@ public IFrameHeader FrameHeader
         /// <param name="propertyName">The name of the property.</param>
         protected void RaisePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         public abstract string GetFrameID(ID3v2TagVersion tagVersion);

diff --git a/IdSharp.Tagging/ID3v2/Classes/FrameContainer.Validation.cs b/IdSharp.Tagging/ID3v2/Classes/FrameContainer.Validation.cs
@@ -281,11 +281,7 @@ private void ValidateAudioFileUrl()
         protected void FireWarning(string propertyName, string message)
         {
             // TODO - Add to log
-            InvalidDataEventHandler tmpInvalidDataEventHandler = InvalidData;
-            if (tmpInvalidDataEventHandler != null)
-            {
-                tmpInvalidDataEventHandler(this, new InvalidDataEventArgs(propertyName, message));
-            }
+            InvalidData?.Invoke(this, new InvalidDataEventArgs(propertyName, message));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v2/Classes/FrameContainer.cs b/IdSharp.Tagging/ID3v2/Classes/FrameContainer.cs
@@ -335,9 +335,7 @@ internal byte[] GetBytes(ID3v2TagVersion tagVersion)
         /// <param name="propertyName">The property name.</param>
         public void RaisePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v2/Classes/Frames/Items/EventTimingItem.cs b/IdSharp.Tagging/ID3v2/Classes/Frames/Items/EventTimingItem.cs
@@ -41,9 +41,7 @@ public int Timestamp
 
         private void RaisePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v2/Classes/Frames/Items/InvolvedPerson.cs b/IdSharp.Tagging/ID3v2/Classes/Frames/Items/InvolvedPerson.cs
@@ -31,9 +31,7 @@ public string Involvement
 
         private void RaisePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v2/Classes/Frames/Items/LanguageItem.cs b/IdSharp.Tagging/ID3v2/Classes/Frames/Items/LanguageItem.cs
@@ -48,9 +48,7 @@ private set
 
         private void RaisePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v2/Classes/Frames/Items/MpegLookupTableItem.cs b/IdSharp.Tagging/ID3v2/Classes/Frames/Items/MpegLookupTableItem.cs
@@ -37,9 +37,7 @@ public long DeviationInMilliseconds
 
         private void RaisePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v2/Classes/Frames/Items/MusicianCreditsItem.cs b/IdSharp.Tagging/ID3v2/Classes/Frames/Items/MusicianCreditsItem.cs
@@ -38,9 +38,7 @@ public string Artists
 
         private void RaisePropertyChanged(String propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v2/Classes/Frames/Items/PriceInformation.cs b/IdSharp.Tagging/ID3v2/Classes/Frames/Items/PriceInformation.cs
@@ -37,9 +37,7 @@ public decimal Price
 
         private void RaisePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v2/Classes/Frames/Items/SynchronizedTextItem.cs b/IdSharp.Tagging/ID3v2/Classes/Frames/Items/SynchronizedTextItem.cs
@@ -41,9 +41,7 @@ public int Timestamp
 
         private void FirePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v2/Classes/Frames/Items/TempoData.cs b/IdSharp.Tagging/ID3v2/Classes/Frames/Items/TempoData.cs
@@ -46,9 +46,7 @@ public int Timestamp
 
         private void RaisePropertyChanged(string propertyName)
         {
-            PropertyChangedEventHandler propertyChanged = PropertyChanged;
-            if (propertyChanged != null)
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/IdSharp.Tagging/ID3v2/FrameBinder.cs b/IdSharp.Tagging/ID3v2/FrameBinder.cs
@@ -30,8 +30,7 @@ public void Bind(INotifyPropertyChanged frame, string frameProperty, string tagP
             frame.PropertyChanged += delegate
             {
                 m_FrameContainer.RaisePropertyChanged(tagProperty);
-                if (validator != null) 
-                    validator();
+                validator?.Invoke();
             };
         }
     }

diff --git a/IdSharp.Tagging/Mpeg4Tag/Mpeg4Tag.cs b/IdSharp.Tagging/Mpeg4Tag/Mpeg4Tag.cs
@@ -106,9 +106,7 @@ private class Atom
 
         private void RaisePropertyChanged(string propertyName)
         {
-            var handler = PropertyChanged;
-            if (handler != null)
-                handler(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
         #region <<< Public Properties >>>

diff --git a/IdSharp.Tagging/SimpleTag/SimpleTag.cs b/IdSharp.Tagging/SimpleTag/SimpleTag.cs
@@ -313,9 +313,7 @@ private void Read(string path)
 
         private void RaisePropertyChanged(string propertyName)
         {
-            var handler = PropertyChanged;
-            if (handler != null)
-                handler(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }