From c0d3635317dfc8453cd8cc8524eef49d50961ed3 Mon Sep 17 00:00:00 2001 From: Clemens Date: Tue, 6 Jul 2021 18:49:48 +0200 Subject: [PATCH] Use string interpolation in debug output --- FileDbCache/Shared/FileDbCache.cs | 10 +++++----- FileDbCache/WPF/FileDbCache.WPF.cs | 6 +++--- MBTiles/Shared/MBTileData.cs | 8 ++++---- MapControl/Shared/BingMapsTileLayer.cs | 2 +- MapControl/Shared/HyperlinkText.cs | 2 +- MapControl/Shared/ImageFileCache.cs | 12 ++++++------ MapControl/Shared/ImageLoader.cs | 6 +++--- MapControl/Shared/MapImageLayer.cs | 2 +- MapControl/Shared/WmsImageLayer.cs | 6 +++--- MapControl/Shared/WmtsTileLayer.cs | 2 +- MapControl/UWP/ImageFileCache.UWP.cs | 4 ++-- MapControl/UWP/TileImageLoader.UWP.cs | 2 +- MapControl/WPF/ImageFileCache.WPF.cs | 8 ++++---- MapControl/WPF/TileImageLoader.WPF.cs | 2 +- MapControl/WinUI/TileImageLoader.WinUI.cs | 2 +- MapImages/Shared/GroundOverlayPanel.cs | 2 +- SQLiteCache/Shared/SQLiteCache.cs | 4 ++-- SQLiteCache/UWP/SQLiteCache.UWP.cs | 4 ++-- SQLiteCache/WPF/SQLiteCache.WPF.cs | 10 +++++----- 19 files changed, 47 insertions(+), 47 deletions(-) diff --git a/FileDbCache/Shared/FileDbCache.cs b/FileDbCache/Shared/FileDbCache.cs index 5b4f0bc4..5156624d 100644 --- a/FileDbCache/Shared/FileDbCache.cs +++ b/FileDbCache/Shared/FileDbCache.cs @@ -47,7 +47,7 @@ namespace MapControl.Caching if (deleted > 0) { - Debug.WriteLine("FileDbCache: Deleted {0} expired items.", deleted); + Debug.WriteLine($"FileDbCache: Deleted {deleted} expired items"); fileDb.Clean(); } } @@ -57,7 +57,7 @@ namespace MapControl.Caching try { fileDb.Open(path); - Debug.WriteLine("FileDbCache: Opened database " + path); + Debug.WriteLine($"FileDbCache: Opened database {path}"); Clean(); } @@ -79,7 +79,7 @@ namespace MapControl.Caching new Field(expiresField, DataTypeEnum.DateTime) }); - Debug.WriteLine("FileDbCache: Created database " + path); + Debug.WriteLine($"FileDbCache: Created database {path}"); } } @@ -91,7 +91,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("FileDbCache.GetRecordByKey({0}): {1}", key, ex.Message); + Debug.WriteLine($"FileDbCache.GetRecordByKey({key}): {ex.Message}"); } return null; @@ -117,7 +117,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("FileDbCache.AddOrUpdateRecord({0}): {1}", key, ex.Message); return; + Debug.WriteLine($"FileDbCache.AddOrUpdateRecord({key}): {ex.Message}"); } } } diff --git a/FileDbCache/WPF/FileDbCache.WPF.cs b/FileDbCache/WPF/FileDbCache.WPF.cs index ab057eb5..4bd7e1ed 100644 --- a/FileDbCache/WPF/FileDbCache.WPF.cs +++ b/FileDbCache/WPF/FileDbCache.WPF.cs @@ -51,7 +51,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("FileDbCache.GetCount(): " + ex.Message); + Debug.WriteLine($"FileDbCache.GetCount(): {ex.Message}"); } return 0; @@ -75,7 +75,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("FileDbCache.Contains({0}): {1}", key, ex.Message); + Debug.WriteLine($"FileDbCache.Contains({key}): {ex.Message}"); } return false; @@ -180,7 +180,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("FileDbCache.Remove({0}): {1}", key, ex.Message); + Debug.WriteLine($"FileDbCache.Remove({key}): {ex.Message}"); } } diff --git a/MBTiles/Shared/MBTileData.cs b/MBTiles/Shared/MBTileData.cs index 7fe6d95c..22b58900 100644 --- a/MBTiles/Shared/MBTileData.cs +++ b/MBTiles/Shared/MBTileData.cs @@ -68,7 +68,7 @@ namespace MapControl.MBTiles } catch (Exception ex) { - Debug.WriteLine("MBTileData: " + ex.Message); + Debug.WriteLine($"MBTileData: {ex.Message}"); } } @@ -89,7 +89,7 @@ namespace MapControl.MBTiles } catch (Exception ex) { - Debug.WriteLine("MBTileData: " + ex.Message); + Debug.WriteLine($"MBTileData: {ex.Message}"); } } @@ -110,7 +110,7 @@ namespace MapControl.MBTiles } catch (Exception ex) { - Debug.WriteLine("MBTileData: {0}/{1}/{2}: {3}", zoomLevel, x, y, ex.Message); + Debug.WriteLine($"MBTileData: {zoomLevel}/{x}/{y}: {ex.Message}"); } return imageBuffer; @@ -132,7 +132,7 @@ namespace MapControl.MBTiles } catch (Exception ex) { - Debug.WriteLine("MBTileData: {0}/{1}/{2}: {3}", zoomLevel, x, y, ex.Message); + Debug.WriteLine($"MBTileData: {zoomLevel}/{x}/{y}: {ex.Message}"); } } } diff --git a/MapControl/Shared/BingMapsTileLayer.cs b/MapControl/Shared/BingMapsTileLayer.cs index a126d67c..e7c00006 100644 --- a/MapControl/Shared/BingMapsTileLayer.cs +++ b/MapControl/Shared/BingMapsTileLayer.cs @@ -65,7 +65,7 @@ namespace MapControl } catch (Exception ex) { - Debug.WriteLine("BingMapsTileLayer: {0}: {1}", metadataUri, ex.Message); + Debug.WriteLine($"BingMapsTileLayer: {metadataUri}: {ex.Message}"); } } else diff --git a/MapControl/Shared/HyperlinkText.cs b/MapControl/Shared/HyperlinkText.cs index 7a5ff3bb..5ad360df 100644 --- a/MapControl/Shared/HyperlinkText.cs +++ b/MapControl/Shared/HyperlinkText.cs @@ -58,7 +58,7 @@ namespace MapControl } catch (Exception ex) { - Debug.WriteLine("{0}: {1}", e.Uri, ex); + Debug.WriteLine($"{e.Uri}: {ex}"); } }; #endif diff --git a/MapControl/Shared/ImageFileCache.cs b/MapControl/Shared/ImageFileCache.cs index 7c1dd42b..487aee87 100644 --- a/MapControl/Shared/ImageFileCache.cs +++ b/MapControl/Shared/ImageFileCache.cs @@ -30,7 +30,7 @@ namespace MapControl.Caching rootDirectory = directory; - Debug.WriteLine("Created ImageFileCache in " + rootDirectory); + Debug.WriteLine($"Created ImageFileCache in {rootDirectory}"); } public Task Clean() @@ -46,7 +46,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("ImageFileCache: Invalid key {0}/{1}: {2}", rootDirectory, key, ex.Message); + Debug.WriteLine($"ImageFileCache: Invalid key {rootDirectory}/{key}: {ex.Message}"); } return null; @@ -62,13 +62,13 @@ namespace MapControl.Caching if (deletedFileCount > 0) { - Debug.WriteLine("ImageFileCache: Cleaned {0} files in {1}", deletedFileCount, dir); + Debug.WriteLine($"ImageFileCache: Cleaned {deletedFileCount} files in {dir}"); } } } catch (Exception ex) { - Debug.WriteLine("ImageFileCache: Failed enumerating directories in {0}: {1}", rootDirectory, ex.Message); + Debug.WriteLine($"ImageFileCache: Failed enumerating directories in {rootDirectory}: {ex.Message}"); } } @@ -89,7 +89,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("ImageFileCache: Failed cleaning {0}: {1}", directory.FullName, ex.Message); + Debug.WriteLine($"ImageFileCache: Failed cleaning {directory.FullName}: {ex.Message}"); } return deletedFileCount; @@ -109,7 +109,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("ImageFileCache: Failed cleaning {0}: {1}", file.FullName, ex.Message); + Debug.WriteLine($"ImageFileCache: Failed cleaning {file.FullName}: {ex.Message}"); } return deletedFileCount; diff --git a/MapControl/Shared/ImageLoader.cs b/MapControl/Shared/ImageLoader.cs index 4fad9340..ffebcab1 100644 --- a/MapControl/Shared/ImageLoader.cs +++ b/MapControl/Shared/ImageLoader.cs @@ -55,7 +55,7 @@ namespace MapControl } catch (Exception ex) { - Debug.WriteLine("ImageLoader: {0}: {1}", uri, ex.Message); + Debug.WriteLine($"ImageLoader: {uri}: {ex.Message}"); } return image; @@ -95,13 +95,13 @@ namespace MapControl } else { - Debug.WriteLine("ImageLoader: {0}: {1} {2}", uri, (int)responseMessage.StatusCode, responseMessage.ReasonPhrase); + Debug.WriteLine($"ImageLoader: {uri}: {(int)responseMessage.StatusCode} {responseMessage.ReasonPhrase}"); } } } catch (Exception ex) { - Debug.WriteLine("ImageLoader: {0}: {1}", uri, ex.Message); + Debug.WriteLine($"ImageLoader: {uri}: {ex.Message}"); } return response; diff --git a/MapControl/Shared/MapImageLayer.cs b/MapControl/Shared/MapImageLayer.cs index 28005124..fc83358e 100644 --- a/MapControl/Shared/MapImageLayer.cs +++ b/MapControl/Shared/MapImageLayer.cs @@ -251,7 +251,7 @@ namespace MapControl } catch (Exception ex) { - Debug.WriteLine("MapImageLayer: " + ex.Message); + Debug.WriteLine($"MapImageLayer: {ex.Message}"); } } diff --git a/MapControl/Shared/WmsImageLayer.cs b/MapControl/Shared/WmsImageLayer.cs index e62f5636..a1f52c67 100644 --- a/MapControl/Shared/WmsImageLayer.cs +++ b/MapControl/Shared/WmsImageLayer.cs @@ -119,7 +119,7 @@ namespace MapControl } catch (Exception ex) { - Debug.WriteLine("WmsImageLayer: {0}: {1}", uri, ex.Message); + Debug.WriteLine($"WmsImageLayer: {uri}: {ex.Message}"); } } } @@ -149,7 +149,7 @@ namespace MapControl } catch (Exception ex) { - Debug.WriteLine("WmsImageLayer: {0}: {1}", uri, ex.Message); + Debug.WriteLine($"WmsImageLayer: {uri}: {ex.Message}"); } } } @@ -176,7 +176,7 @@ namespace MapControl } catch (Exception ex) { - Debug.WriteLine("WmsImageLayer: {0}: {1}", uri, ex.Message); + Debug.WriteLine($"WmsImageLayer: {uri}: {ex.Message}"); } } } diff --git a/MapControl/Shared/WmtsTileLayer.cs b/MapControl/Shared/WmtsTileLayer.cs index b004d96e..1160dc2e 100644 --- a/MapControl/Shared/WmtsTileLayer.cs +++ b/MapControl/Shared/WmtsTileLayer.cs @@ -208,7 +208,7 @@ namespace MapControl } catch (Exception ex) { - Debug.WriteLine("WmtsTileLayer: {0}: {1}", CapabilitiesUri, ex.Message); + Debug.WriteLine($"WmtsTileLayer: {CapabilitiesUri}: {ex.Message}"); } } } diff --git a/MapControl/UWP/ImageFileCache.UWP.cs b/MapControl/UWP/ImageFileCache.UWP.cs index 77c63595..0d13dd4f 100644 --- a/MapControl/UWP/ImageFileCache.UWP.cs +++ b/MapControl/UWP/ImageFileCache.UWP.cs @@ -28,7 +28,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("ImageFileCache: Failed reading {0}: {1}", path, ex.Message); + Debug.WriteLine($"ImageFileCache: Failed reading {path}: {ex.Message}"); } return cacheItem; @@ -52,7 +52,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("ImageFileCache: Failed writing {0}: {1}", path, ex.Message); + Debug.WriteLine($"ImageFileCache: Failed writing {path}: {ex.Message}"); } } } diff --git a/MapControl/UWP/TileImageLoader.UWP.cs b/MapControl/UWP/TileImageLoader.UWP.cs index a1ae698a..183f3036 100644 --- a/MapControl/UWP/TileImageLoader.UWP.cs +++ b/MapControl/UWP/TileImageLoader.UWP.cs @@ -52,7 +52,7 @@ namespace MapControl await Cache.SetAsync(cacheKey, buffer, GetExpiration(response.MaxAge)).ConfigureAwait(false); } } - //else System.Diagnostics.Debug.WriteLine("Cached: " + cacheKey); + //else System.Diagnostics.Debug.WriteLine($"Cached: {cacheKey}"); if (buffer != null && buffer.Length > 0) { diff --git a/MapControl/WPF/ImageFileCache.WPF.cs b/MapControl/WPF/ImageFileCache.WPF.cs index 62c92753..1787c2c9 100644 --- a/MapControl/WPF/ImageFileCache.WPF.cs +++ b/MapControl/WPF/ImageFileCache.WPF.cs @@ -77,7 +77,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("ImageFileCache: Failed finding {0}: {1}", path, ex.Message); + Debug.WriteLine($"ImageFileCache: Failed finding {path}: {ex.Message}"); } return false; @@ -115,7 +115,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("ImageFileCache: Failed reading {0}: {1}", path, ex.Message); + Debug.WriteLine($"ImageFileCache: Failed reading {path}: {ex.Message}"); } } @@ -175,7 +175,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("ImageFileCache: Failed writing {0}: {1}", path, ex.Message); + Debug.WriteLine($"ImageFileCache: Failed writing {path}: {ex.Message}"); } } } @@ -238,7 +238,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("ImageFileCache: Failed removing {0}: {1}", path, ex.Message); + Debug.WriteLine($"ImageFileCache: Failed removing {path}: {ex.Message}"); } return null; diff --git a/MapControl/WPF/TileImageLoader.WPF.cs b/MapControl/WPF/TileImageLoader.WPF.cs index cbd76843..368d417d 100644 --- a/MapControl/WPF/TileImageLoader.WPF.cs +++ b/MapControl/WPF/TileImageLoader.WPF.cs @@ -43,7 +43,7 @@ namespace MapControl Cache.Set(cacheKey, cacheItem, new CacheItemPolicy { AbsoluteExpiration = cacheItem.Item2 }); } } - //else System.Diagnostics.Debug.WriteLine("Cached: " + cacheKey); + //else System.Diagnostics.Debug.WriteLine($"Cached: {cacheKey}"); if (buffer != null && buffer.Length > 0) { diff --git a/MapControl/WinUI/TileImageLoader.WinUI.cs b/MapControl/WinUI/TileImageLoader.WinUI.cs index d3167daa..8f998f5f 100644 --- a/MapControl/WinUI/TileImageLoader.WinUI.cs +++ b/MapControl/WinUI/TileImageLoader.WinUI.cs @@ -52,7 +52,7 @@ namespace MapControl await Cache.SetAsync(cacheKey, buffer, GetExpiration(response.MaxAge)).ConfigureAwait(false); } } - //else System.Diagnostics.Debug.WriteLine("Cached: " + cacheKey); + //else System.Diagnostics.Debug.WriteLine($"Cached: {cacheKey}"); if (buffer != null && buffer.Length > 0) { diff --git a/MapImages/Shared/GroundOverlayPanel.cs b/MapImages/Shared/GroundOverlayPanel.cs index 4183f348..f9cf116d 100644 --- a/MapImages/Shared/GroundOverlayPanel.cs +++ b/MapImages/Shared/GroundOverlayPanel.cs @@ -81,7 +81,7 @@ namespace MapControl.Images } catch (Exception ex) { - Debug.WriteLine("GroundOverlayPanel: {0}: {1}", path, ex.Message); + Debug.WriteLine($"GroundOverlayPanel: {path}: {ex.Message}"); } } diff --git a/SQLiteCache/Shared/SQLiteCache.cs b/SQLiteCache/Shared/SQLiteCache.cs index 1fcecfb8..0884e2dc 100644 --- a/SQLiteCache/Shared/SQLiteCache.cs +++ b/SQLiteCache/Shared/SQLiteCache.cs @@ -43,7 +43,7 @@ namespace MapControl.Caching command.ExecuteNonQuery(); } - Debug.WriteLine("SQLiteCache: Opened database " + path); + Debug.WriteLine($"SQLiteCache: Opened database {path}"); return connection; } @@ -66,7 +66,7 @@ namespace MapControl.Caching var deleted = (long)command.ExecuteScalar(); if (deleted > 0) { - Debug.WriteLine("SQLiteCache: Deleted {0} expired items.", deleted); + Debug.WriteLine($"SQLiteCache: Deleted {deleted} expired items"); } } #endif diff --git a/SQLiteCache/UWP/SQLiteCache.UWP.cs b/SQLiteCache/UWP/SQLiteCache.UWP.cs index 081b897e..ac458dfd 100644 --- a/SQLiteCache/UWP/SQLiteCache.UWP.cs +++ b/SQLiteCache/UWP/SQLiteCache.UWP.cs @@ -26,7 +26,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("SQLiteCache.GetAsync({0}): {1}", key, ex.Message); + Debug.WriteLine($"SQLiteCache.GetAsync({key}): {ex.Message}"); } return null; @@ -43,7 +43,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("SQLiteCache.SetAsync({0}): {1}", key, ex.Message); + Debug.WriteLine($"SQLiteCache.SetAsync({key}): {ex.Message}"); } } } diff --git a/SQLiteCache/WPF/SQLiteCache.WPF.cs b/SQLiteCache/WPF/SQLiteCache.WPF.cs index a4da23ad..8808ffd7 100644 --- a/SQLiteCache/WPF/SQLiteCache.WPF.cs +++ b/SQLiteCache/WPF/SQLiteCache.WPF.cs @@ -55,7 +55,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("SQLiteCache.GetCount(): {0}", ex.Message); + Debug.WriteLine($"SQLiteCache.GetCount(): {ex.Message}"); } return 0; @@ -82,7 +82,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("SQLiteCache.Contains({0}): {1}", key, ex.Message); + Debug.WriteLine($"SQLiteCache.Contains({key}): {ex.Message}"); } return false; @@ -114,7 +114,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("SQLiteCache.Get({0}): {1}", key, ex.Message); + Debug.WriteLine($"SQLiteCache.Get({key}): {ex.Message}"); } return null; @@ -158,7 +158,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("SQLiteCache.Set({0}): {1}", key, ex.Message); + Debug.WriteLine($"SQLiteCache.Set({key}): {ex.Message}"); } } @@ -210,7 +210,7 @@ namespace MapControl.Caching } catch (Exception ex) { - Debug.WriteLine("SQLiteCache.Remove({0}): {1}", key, ex.Message); + Debug.WriteLine($"SQLiteCache.Remove({key}): {ex.Message}"); } }