Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -r22469012664426d8196f8cd350cde57a8a50bc70 -r019659033f11f75408fd860bdca238616244491a
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj (.../Core.Common.Utils.csproj) (revision 22469012664426d8196f8cd350cde57a8a50bc70)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj (.../Core.Common.Utils.csproj) (revision 019659033f11f75408fd860bdca238616244491a)
@@ -117,7 +117,6 @@
-
Fisheye: Tag 019659033f11f75408fd860bdca238616244491a refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Diagnostics/ResourceMonitor.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj
===================================================================
diff -u -r293be5aa0c9cfb58fea075f0ce6943fdfb310406 -r019659033f11f75408fd860bdca238616244491a
--- Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj (.../Core.Common.TestUtils.csproj) (revision 293be5aa0c9cfb58fea075f0ce6943fdfb310406)
+++ Core/Common/test/Core.Common.TestUtils/Core.Common.TestUtils.csproj (.../Core.Common.TestUtils.csproj) (revision 019659033f11f75408fd860bdca238616244491a)
@@ -91,12 +91,6 @@
-
- Form
-
-
- ResourceMonitor.cs
-
True
True
@@ -129,9 +123,6 @@
-
- ResourceMonitor.cs
-
ResXFileCodeGenerator
Resources.Designer.cs
Index: Core/Common/test/Core.Common.TestUtils/GuiTestHelper.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r019659033f11f75408fd860bdca238616244491a
--- Core/Common/test/Core.Common.TestUtils/GuiTestHelper.cs (.../GuiTestHelper.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/test/Core.Common.TestUtils/GuiTestHelper.cs (.../GuiTestHelper.cs) (revision 019659033f11f75408fd860bdca238616244491a)
@@ -18,11 +18,6 @@
///
public class GuiTestHelper
{
- ///
- /// Enable to monitor allocated/deallocated resources
- ///
- public static bool UseResourceMonitor = false;
-
private static GuiTestHelper instance;
private static readonly ILog log = LogManager.GetLogger(typeof(WindowsFormsTestHelper));
@@ -35,8 +30,6 @@
private static bool appDomainExceptionOccured;
- private static readonly ResourceMonitor resourceMonitor;
-
static GuiTestHelper()
{
MessageBox.CustomMessageBox = new LoggingMessageBox();
@@ -48,12 +41,6 @@
Dispatcher.CurrentDispatcher.UnhandledException += CurrentDispatcher_UnhandledException;
AppDomain.CurrentDomain.UnhandledException += AppDomain_UnhandledException;
Application.ThreadException += Application_ThreadException;
-
- if (UseResourceMonitor && resourceMonitor == null)
- {
- resourceMonitor = new ResourceMonitor();
- resourceMonitor.Show();
- }
}
public static GuiTestHelper Instance
Fisheye: Tag 019659033f11f75408fd860bdca238616244491a refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/ResourceMonitor.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 019659033f11f75408fd860bdca238616244491a refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/ResourceMonitor.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 019659033f11f75408fd860bdca238616244491a refers to a dead (removed) revision in file `Core/Common/test/Core.Common.TestUtils/ResourceMonitor.resx'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/GIS/src/Core.GIS.SharpMap/Layers/Layer.cs
===================================================================
diff -u -rce62e274ed578602f6e0d44f08d3729c46220363 -r019659033f11f75408fd860bdca238616244491a
--- Core/GIS/src/Core.GIS.SharpMap/Layers/Layer.cs (.../Layer.cs) (revision ce62e274ed578602f6e0d44f08d3729c46220363)
+++ Core/GIS/src/Core.GIS.SharpMap/Layers/Layer.cs (.../Layer.cs) (revision 019659033f11f75408fd860bdca238616244491a)
@@ -25,7 +25,6 @@
using Core.Common.Base;
using Core.Common.Utils.Aop;
using Core.Common.Utils.Aop.Markers;
-using Core.Common.Utils.Diagnostics;
using Core.GIS.GeoAPI.CoordinateSystems;
using Core.GIS.GeoAPI.CoordinateSystems.Transformations;
using Core.GIS.GeoAPI.Extensions.Feature;
@@ -1061,9 +1060,6 @@
if (image != null)
{
image.Dispose();
-
- ResourceMonitor.OnResourceDeallocated(this, image);
-
image = null;
}
}
@@ -1092,7 +1088,6 @@
if (image == null)
{
image = new Bitmap(Map.Size.Width, Map.Size.Height, PixelFormat.Format32bppPArgb);
- ResourceMonitor.OnResourceAllocated(this, image);
}
if (!Visible || MaxVisible < Map.Zoom || MinVisible > Map.Zoom)
Index: Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs
===================================================================
diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -r019659033f11f75408fd860bdca238616244491a
--- Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs (.../Map.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755)
+++ Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs (.../Map.cs) (revision 019659033f11f75408fd860bdca238616244491a)
@@ -28,7 +28,6 @@
using Core.Common.Utils.Aop.Markers;
using Core.Common.Utils.Collections;
using Core.Common.Utils.Collections.Generic;
-using Core.Common.Utils.Diagnostics;
using Core.GIS.GeoAPI.CoordinateSystems;
using Core.GIS.GeoAPI.Extensions.Feature;
using Core.GIS.GeoAPI.Geometries;
@@ -292,7 +291,6 @@
{
if (image != null)
{
- ResourceMonitor.OnResourceDeallocated(this, image);
image.Dispose();
image = null;
}
@@ -324,14 +322,12 @@
if (image != null && (Size.Width != image.Width || Size.Height != image.Height)) // re-create only when it is required
{
image.Dispose();
- ResourceMonitor.OnResourceDeallocated(this, image);
image = null;
}
if (image == null)
{
image = new Bitmap(Size.Width, Size.Height, PixelFormat.Format32bppPArgb);
- ResourceMonitor.OnResourceAllocated(this, image);
}
if (rendering)