minor

SVN: trunk@3216

Author: fabiomaulo

src/NHibernate/Action/BulkOperationCleanupAction.cs

@@ -1,10 +1,9 @@
 using System;
+using System.Collections;
 using Iesi.Collections;
 using Iesi.Collections.Generic;
 using NHibernate.Engine;
 using NHibernate.Persister.Entity;
-using System.Collections;
-using NHibernate.Util;
 
 namespace NHibernate.Action
 {

src/NHibernate/Action/CollectionAction.cs

@@ -160,16 +160,15 @@ public virtual int CompareTo(CollectionAction other)
 			else
 			{
 				//then by fk
-				return persister.KeyType.Compare(key, other.key, EntityMode.Poco);
+				return persister.KeyType.Compare(key, other.key, session.EntityMode);
 			}
 		}
 
 		#endregion
 
 		public override string ToString()
 		{
-			// TODO: H3.2 Different behaviour (use persister istead collectionRole)
-			return StringHelper.Unqualify(GetType().FullName) + MessageHelper.InfoString(persister, key);
+			return StringHelper.Unqualify(GetType().FullName) + MessageHelper.InfoString(collectionRole, key);
 		}
 
 		#region IDeserializationCallback Members

src/NHibernate/Action/CollectionUpdateAction.cs

@@ -63,10 +63,5 @@ public override void Execute()
 				Session.Factory.StatisticsImplementor.UpdateCollection(Persister.Role);
 			}
 		}
-
-		public override int CompareTo(CollectionAction other)
-		{
-			return 0;
-		}
 	}
 }

src/NHibernate/Action/EntityAction.cs

@@ -3,6 +3,8 @@
 using System.Runtime.Serialization;
 using NHibernate.Engine;
 using NHibernate.Persister.Entity;
+using NHibernate.Util;
+using NHibernate.Impl;
 
 namespace NHibernate.Action
 {
@@ -95,7 +97,7 @@ public object[] PropertySpaces
 
 		public void BeforeExecutions()
 		{
-			throw new HibernateException("BeforeExecutions() called for non-collection action");
+			throw new AssertionFailure("BeforeExecutions() called for non-collection action");
 		}
 
 		public abstract void Execute();
@@ -143,5 +145,10 @@ void IDeserializationCallback.OnDeserialization(object sender)
 		}
 
 		#endregion
+
+		public override string ToString()
+		{
+			return StringHelper.Unqualify(GetType().FullName) + MessageHelper.InfoString(entityName, id);
+		}
 	}
 }

src/NHibernate/Action/EntityUpdateAction.cs

@@ -193,10 +193,5 @@ private bool PreUpdate()
 			}
 			return veto;
 		}
-
-		public override int CompareTo(EntityAction other)
-		{
-			return 0;
-		}
 	}
 }