ResolveByCallBack callback has object type as argument

Author: janjanech

SharpDiffLib/algorithms/resolveConflicts/common/callBack/ResolveByCallBack.cs

@@ -6,23 +6,27 @@ namespace SharpDiffLib.algorithms.resolveConflicts.common.callBack
 {
 	internal class ResolveByCallBack<TType> : IResolveConflictsAlgorithm<TType>
 	{
-		private readonly Action<IConflictResolver> aCallBack;
+		private readonly Action<Type, IConflictResolver> aCallBack;
 
-		public ResolveByCallBack(Action<IConflictResolver> callBack)
+		public ResolveByCallBack(Action<Type, IConflictResolver> callBack)
 		{
 			this.aCallBack = callBack;
 		}
 
-		#region Implementation of IResolveConflictsAlgorithm
+		#region Implementation of IResolveConflictsAlgorithm<TType>
 
 		public void ResolveConflicts(IConflictResolver<TType> resolver)
 		{
-			this.aCallBack(resolver);
+			this.aCallBack(typeof(TType), resolver);
 		}
 
+		#endregion
+
+		#region Implementation of IResolveConflictsAlgorithm
+
 		public void ResolveConflicts(IConflictResolver resolver)
 		{
-			this.aCallBack(resolver);
+			this.ResolveConflicts((IConflictResolver<TType>) resolver);
 		}
 
 		#endregion

SharpDiffLib/algorithms/resolveConflicts/common/callBack/ResolveByCallBackRules.cs

@@ -7,14 +7,14 @@ namespace SharpDiffLib.algorithms.resolveConflicts.common.callBack
 {
 	public class ResolveByCallBackRules<TDefinedFor> : BaseRules<TDefinedFor>, IResolveConflictsAlgorithmRules<TDefinedFor>
 	{
-		private Action<IConflictResolver> aCallBack;
+		private Action<Type, IConflictResolver> aCallBack;
 
 		public ResolveByCallBackRules()
 		{
 			this.aCallBack = null;
 		}
 
-		public ResolveByCallBackRules<TDefinedFor> CallBack(Action<IConflictResolver> callBack)
+		public ResolveByCallBackRules<TDefinedFor> CallBack(Action<Type, IConflictResolver> callBack)
 		{
 			this.aCallBack = callBack;
 

SharpDiffLib/algorithms/resolveConflicts/common/dontResolve/DontResolve.cs

@@ -5,16 +5,20 @@ namespace SharpDiffLib.algorithms.resolveConflicts.common.dontResolve
 {
 	internal class DontResolve<TType> : IResolveConflictsAlgorithm<TType>
 	{
-		#region Implementation of IResolveConflictsAlgorithm
+		#region Implementation of IResolveConflictsAlgorithm<TType>
 
 		public void ResolveConflicts(IConflictResolver<TType> resolver)
 		{
 			throw new NotPossibleToResolveException();
 		}
 
+		#endregion
+
+		#region Implementation of IResolveConflictsAlgorithm
+
 		public void ResolveConflicts(IConflictResolver resolver)
 		{
-			throw new NotPossibleToResolveException();
+			this.ResolveConflicts((IConflictResolver<TType>)resolver);
 		}
 
 		#endregion

SharpDiffLib/algorithms/resolveConflicts/common/resolveAllSame/ResolveAllSame.cs

@@ -13,18 +13,21 @@ public ResolveAllSame(ResolveAction action)
 			this.aAction = action;
 		}
 
-		#region Implementation of IResolveConflictsAlgorithm
+		#region Implementation of IResolveConflictsAlgorithm<TType>
 
 		public void ResolveConflicts(IConflictResolver<TType> resolver)
 		{
 			foreach (var item in resolver.ToList())
 				resolver.ResolveConflict(item, this.aAction);
 		}
 
+		#endregion
+
+		#region Implementation of IResolveConflictsAlgorithm
+
 		public void ResolveConflicts(IConflictResolver resolver)
 		{
-			foreach (var item in resolver.ToList())
-				resolver.ResolveConflict(item, this.aAction);
+			this.ResolveConflicts((IConflictResolver<TType>)resolver);
 		}
 
 		#endregion