Commit: master - CleanAuLait.ObservableCollectionsMod (git)

Cysharp/ObservableCollections をベースにしたUI表示用の同期ビュー

Commit MetaInfo

• Revision: 87a8ee4d858ecff8f6b35b7fd7fc72a5882fadbf (tree)
• Time: 2022-10-20 15:32:38
• Author: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[MOD] ビュー破棄時のトレースログを無効化

Change Summary

• modified: Internal/SortableSynchronizedCoupleView.cs
• modified: Internal/SynchronizedCoupleView.cs
• modified: Internal/SynchronizedSingleView.NCCListView.cs
• modified: Internal/SynchronizedSingleView.cs

Incremental Difference

--- a/Internal/SortableSynchronizedCoupleView.cs
+++ b/Internal/SortableSynchronizedCoupleView.cs
@@ -1,4 +1,5 @@
-#if DEBUG
+//#define TRACE_DISPOSE
+#if DEBUG && TRACE_DISPOSE
 using NLog;
 #endif
 using ObservableCollections;
@@ -11,7 +12,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
             ISortableSynchronizedCoupleView<T, TKey, TView>
             where TKey : notnull
     {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 #endif
 
@@ -120,13 +121,13 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
             {
                 if (disposing)
                 {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                     logger.Trace("{0} disposing SortableSynchronizedCoupleView...", GetType().FullName);
 #endif
 
                     DisconnectSource();
 
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                     logger.Trace("{0} SortableSynchronizedCoupleView disposed.", GetType().FullName);
 #endif
                 }
@@ -183,7 +184,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
 
             lock (this.SyncRoot)
             {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                 logger.Trace("{0} disconnect from source.", GetType().FullName);
 #endif
 
@@ -191,7 +192,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
 
                 if (this.disposeElement)
                 {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                     logger.Trace("{0} (T, TView) elements disposing...", GetType().FullName);
 #endif
 
@@ -203,7 +204,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
                         }
                     }
 
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                     logger.Trace("{0} (T, TView) elements disposed.", GetType().FullName);
 #endif
                 }

--- a/Internal/SynchronizedCoupleView.cs
+++ b/Internal/SynchronizedCoupleView.cs
@@ -1,4 +1,5 @@
-#if DEBUG
+//#define TRACE_DISPOSE
+#if DEBUG && TRACE_DISPOSE
 using NLog;
 #endif
 using ObservableCollections;
@@ -10,7 +11,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
 {
     internal sealed class SynchronizedCoupleView<T, TView> : ISynchronizedCoupleView<T, TView>
     {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 #endif
 
@@ -117,13 +118,13 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
             {
                 if (disposing)
                 {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                     logger.Trace("{0} disposing CoupleView...", GetType().FullName);
 #endif
 
                     DisconnectSource();
 
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                     logger.Trace("{0} CoupleView disposed.", GetType().FullName);
 #endif
                 }
@@ -168,7 +169,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
 
             lock (this.SyncRoot)
             {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                 logger.Trace("{0} disconnect from source.", GetType().FullName);
 #endif
 
@@ -176,7 +177,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
 
                 if (this.disposeElement)
                 {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                     logger.Trace("{0} (T, TView) elements disposing...", this.GetType().FullName);
 #endif
 
@@ -187,7 +188,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
                             disposable.Dispose();
                         }
                     }
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                     logger.Trace("{0} (T, TView) elements disposed.", this.GetType().FullName);
 #endif
                 }

--- a/Internal/SynchronizedSingleView.NCCListView.cs
+++ b/Internal/SynchronizedSingleView.NCCListView.cs
@@ -1,4 +1,5 @@
-#if DEBUG
+//#define TRACE_DISPOSE
+#if DEBUG && TRACE_DISPOSE
 using NLog;
 #endif
 using ObservableCollections;
@@ -17,7 +18,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
 
         class NCCListView : INotifyCollectionChangedListSynchronizedSingleView<T, TView>
         {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
             private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 #endif
 
@@ -125,18 +126,18 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
 
             public void Dispose()
             {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                 logger.Trace("{0} disposing NCCListSingleView...", this.GetType().FullName);
 #endif
                 this.parent.RoutingCollectionChanged -= Parent_RoutingCollectionChanged;
 
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                 logger.Trace("{0} parent disposing...", this.GetType().FullName);
 #endif
 
                 parent.Dispose();
 
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                 logger.Trace("{0} parent and NCCListSingleView disposed.", this.GetType().FullName);
 #endif
             }

--- a/Internal/SynchronizedSingleView.cs
+++ b/Internal/SynchronizedSingleView.cs
@@ -1,4 +1,5 @@
-#if DEBUG
+//#define TRACE_DISPOSE
+#if DEBUG && TRACE_DISPOSE
 using NLog;
 #endif
 using ObservableCollections;
@@ -10,7 +11,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
 {
     internal sealed partial class SynchronizedSingleView<T, TView> : ISynchronizedSingleView<T, TView>
     {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 #endif
 
@@ -70,7 +71,7 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
 
         public void Dispose()
         {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
             logger.Trace("{0} disposing SingleView...", this.GetType().FullName);
 #endif
 
@@ -78,18 +79,18 @@ namespace CleanAuLait.ObservableCollectionsMod.Internal
 
             if (this.disposeParent)
             {
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                 logger.Trace("{0} parent disposing...", this.GetType().FullName);
 #endif
 
                 this.parent.Dispose();
 
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
                 logger.Trace("{0} parent disposed.", this.GetType().FullName);
 #endif
             }
 
-#if DEBUG
+#if DEBUG && TRACE_DISPOSE
             logger.Trace("{0} SingleView disposed.", this.GetType().FullName);
 #endif
         }