ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-04 14:08:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use C# 7

Browse source
This commit is contained in:
ClemensF 2020-04-16 23:15:03 +02:00
parent 3ffb613f80
commit 310f0cca9a
21 changed files with 51 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MapControl/WPF/ImageFileCache.WPF.cs
View file

@ -160,9 +160,8 @@ namespace MapControl.Caching
throw new ArgumentNullException("The parameter key must not be null.");
}
var imageCacheItem = value as ImageCacheItem;
if (imageCacheItem == null)
if (!(value is ImageCacheItem imageCacheItem))
{
throw new ArgumentException("The parameter value must be a MapControl.Caching.ImageCacheItem instance.");
}

10
MapControl/WPF/MapPath.WPF.cs
View file

@ -35,16 +35,14 @@ namespace MapControl
protected void DataCollectionPropertyChanged(DependencyPropertyChangedEventArgs e)
{
INotifyCollectionChanged collection;
if ((collection = e.OldValue as INotifyCollectionChanged) != null)
if (e.OldValue is INotifyCollectionChanged oldCollection)
{
CollectionChangedEventManager.RemoveListener(collection, this);
CollectionChangedEventManager.RemoveListener(oldCollection, this);
}
if ((collection = e.NewValue as INotifyCollectionChanged) != null)
if (e.NewValue is INotifyCollectionChanged newCollection)
{
CollectionChangedEventManager.AddListener(collection, this);
CollectionChangedEventManager.AddListener(newCollection, this);
}
UpdateData();

4
MapControl/WPF/Tile.WPF.cs
View file

@ -17,9 +17,7 @@ namespace MapControl
if (fadeIn && FadeDuration > TimeSpan.Zero)
{
var bitmap = image as BitmapSource;
if (bitmap != null && !bitmap.IsFrozen && bitmap.IsDownloading)
if (image is BitmapSource bitmap && !bitmap.IsFrozen && bitmap.IsDownloading)
{
bitmap.DownloadCompleted += BitmapDownloadCompleted;
bitmap.DownloadFailed += BitmapDownloadFailed;