Use string interpolation in debug output

This commit is contained in:
Clemens 2021-07-06 18:49:48 +02:00
parent 7aaa4ed25e
commit c0d3635317
19 changed files with 47 additions and 47 deletions

View file

@ -65,7 +65,7 @@ namespace MapControl
}
catch (Exception ex)
{
Debug.WriteLine("BingMapsTileLayer: {0}: {1}", metadataUri, ex.Message);
Debug.WriteLine($"BingMapsTileLayer: {metadataUri}: {ex.Message}");
}
}
else

View file

@ -58,7 +58,7 @@ namespace MapControl
}
catch (Exception ex)
{
Debug.WriteLine("{0}: {1}", e.Uri, ex);
Debug.WriteLine($"{e.Uri}: {ex}");
}
};
#endif

View file

@ -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;

View file

@ -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;

View file

@ -251,7 +251,7 @@ namespace MapControl
}
catch (Exception ex)
{
Debug.WriteLine("MapImageLayer: " + ex.Message);
Debug.WriteLine($"MapImageLayer: {ex.Message}");
}
}

View file

@ -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}");
}
}
}

View file

@ -208,7 +208,7 @@ namespace MapControl
}
catch (Exception ex)
{
Debug.WriteLine("WmtsTileLayer: {0}: {1}", CapabilitiesUri, ex.Message);
Debug.WriteLine($"WmtsTileLayer: {CapabilitiesUri}: {ex.Message}");
}
}
}

View file

@ -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}");
}
}
}

View file

@ -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)
{

View file

@ -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;

View file

@ -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)
{

View file

@ -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)
{