orm-commits Mailing List for Object-Role Modeling (Page 5)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1376
          http://orm.svn.sourceforge.net/orm/?rev=1376&view=rev
Author:   mcurland
Date:     2009-04-01 01:49:40 +0000 (Wed, 01 Apr 2009)

Log Message:
-----------
Automatically fix duplicate auto-generated constraint names on load. fixes #389
Also updated extension example to work with current model error fixup.

Modified Paths:
--------------
    trunk/ExtensionExample/CustomExtensionError.cs
    trunk/ExtensionExample/ExtensionDomainModel.DeserializationFixupListeners.cs
    trunk/ORMModel/Framework/NamedElementDictionary.cs
    trunk/ORMModel/ObjectModel/Grouping.cs
    trunk/ORMModel/ObjectModel/ORMModel.cs

Modified: trunk/ExtensionExample/CustomExtensionError.cs
===================================================================

--- trunk/ExtensionExample/CustomExtensionError.cs	2009-03-31 19:25:05 UTC (rev 1375)
+++ trunk/ExtensionExample/CustomExtensionError.cs	2009-04-01 01:49:40 UTC (rev 1376)
@@ -158,7 +158,7 @@
 		private sealed class ObjectTypeNameFixupListener : DeserializationFixupListener<ObjectType>
 		{
 			public ObjectTypeNameFixupListener()
-				: base((int)ORMDeserializationFixupPhase.ValidateImplicitStoredElements)
+				: base((int)ExtensionExampleFixupPhase.ValidateMeaningfulNames)
 			{
 			}
 			protected sealed override void ProcessElement(ObjectType element, Store store, INotifyElementAdded notifyAdded)

Modified: trunk/ExtensionExample/ExtensionDomainModel.DeserializationFixupListeners.cs
===================================================================
--- trunk/ExtensionExample/ExtensionDomainModel.DeserializationFixupListeners.cs	2009-03-31 19:25:05 UTC (rev 1375)
+++ trunk/ExtensionExample/ExtensionDomainModel.DeserializationFixupListeners.cs	2009-04-01 01:49:40 UTC (rev 1376)
@@ -6,18 +6,36 @@
 
 namespace ORMSolutions.ORMArchitect.ExtensionExample
 {
+	/// <summary>
+	/// A custom fixup phase for the extension example
+	/// </summary>
+	public enum ExtensionExampleFixupPhase
+	{
+		/// <summary>
+		/// Validate meaningful names after the ORM model has completed its name validation.
+		/// This enables any names that require regeneration to be automatically generated
+		/// before we determine if the names are meaningful.
+		/// </summary>
+		ValidateMeaningfulNames = ORMDeserializationFixupPhase.ValidateElementNames + 1,
+	}
 	public partial class ExtensionDomainModel : IDeserializationFixupListenerProvider
 	{
 		#region IDeserializationFixupListenerProvider Implementation
 		/// <summary>
 		/// Implements IDeserializationFixupListenerProvider.DeserializationFixupListenerCollection
 		/// </summary>
-		protected static IEnumerable<IDeserializationFixupListener> DeserializationFixupListenerCollection
+		protected IEnumerable<IDeserializationFixupListener> DeserializationFixupListenerCollection
 		{
 			get
 			{
 				yield return new MyCustomExtensionElementFixupListener();
 				yield return ObjectTypeRequiresMeaningfulNameError.ObjectTypeNameErrorFixupListener;
+				// The errors in this model will be ignore by the ORM error validator because they are
+				// in the wrong domain model. Register our own handler to deal with these errors.
+				// Note that this could also be handled by explicitly add/removing validating errors
+				// from the task provider when we create them, but this general facility is easier to
+				// use because it does this for us.
+				yield return ModelError.GetFixupListener((int)ORMDeserializationFixupPhase.ValidateErrors, DomainModelInfo);
 			}
 		}
 		IEnumerable<IDeserializationFixupListener> IDeserializationFixupListenerProvider.DeserializationFixupListenerCollection
@@ -35,7 +53,7 @@
 		{
 			get
 			{
-				return null;
+				return typeof(ExtensionExampleFixupPhase);
 			}
 		}
 		Type IDeserializationFixupListenerProvider.DeserializationFixupPhaseType

Modified: trunk/ORMModel/Framework/NamedElementDictionary.cs
===================================================================
--- trunk/ORMModel/Framework/NamedElementDictionary.cs	2009-03-31 19:25:05 UTC (rev 1375)
+++ trunk/ORMModel/Framework/NamedElementDictionary.cs	2009-04-01 01:49:40 UTC (rev 1376)
@@ -25,6 +25,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
+using System.Text.RegularExpressions;
 using Microsoft.VisualStudio.Modeling;
 
 namespace ORMSolutions.ORMArchitect.Framework
@@ -584,6 +585,18 @@
 			return null;
 		}
 		/// <summary>
+		/// If a duplicate name is caught during load, then determine if the name
+		/// is an auto-generated name that should be regenerated instead of tracked
+		/// as a duplicate name error. The default implementation returns <see langword="false"/>.
+		/// </summary>
+		/// <param name="element">The element with the duplicate name</param>
+		/// <param name="elementName">The pre-fetched element name</param>
+		/// <returns>Return <see langword="true"/> to reset the name.</returns>
+		protected virtual bool ShouldResetDuplicateName(ModelElement element, string elementName)
+		{
+			return false;
+		}
+		/// <summary>
 		/// Override to throw a custom exception when
 		/// adding duplicate names is not allowed.
 		/// </summary>
@@ -627,6 +640,25 @@
 			} while(dic.ContainsKey(newKey));
 			return newKey;
 		}
+		/// <summary>
+		/// Test if an <paramref name="elementName"/> is a decorated form of the root name pattern
+		/// for an <paramref name="element"/>. Provides a stock implementation for derived implementations
+		/// of the <see cref="ShouldResetDuplicateName"/> method.
+		/// </summary>
+		/// <param name="element">The element to retrieve the root name pattern for.</param>
+		/// <param name="elementName">The pre-fetched element name to compare to.</param>
+		/// <returns><see langword="true"/> if the name could have been generated from
+		/// the string returned from <see cref="GetRootNamePattern"/></returns>
+		protected bool IsDecoratedRootName(ModelElement element, string elementName)
+		{
+			string rootName = this.GetRootNamePattern(element);
+			return Regex.IsMatch(
+				elementName,
+				rootName.Contains("{0}") ?
+					@"\A" + string.Format(CultureInfo.InvariantCulture, rootName, @"\d+") + @"\z" :
+					@"\A" + rootName + @"\d+\z",
+				RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+		}
 		#endregion // Unique name generation
 		#region INamedElementDictionary Members
 		void INamedElementDictionary.AddElement(ModelElement element, DuplicateNameAction duplicateAction, INotifyElementAdded notifyAdded)
@@ -738,6 +770,10 @@
 				// to not throw an exception
 				return;
 			}
+			else if (notifyAdded != null && ShouldResetDuplicateName(element, elementName))
+			{
+				AddElement(element, duplicateAction, "", notifyAdded);
+			}
 			else
 			{
 				ModelElement singleElement = locateData.SingleElement;

Modified: trunk/ORMModel/ObjectModel/Grouping.cs
===================================================================
--- trunk/ORMModel/ObjectModel/Grouping.cs	2009-03-31 19:25:05 UTC (rev 1375)
+++ trunk/ORMModel/ObjectModel/Grouping.cs	2009-04-01 01:49:40 UTC (rev 1376)
@@ -1023,6 +1023,7 @@
 	}
 	#endregion // GroupDuplicateNameError class
 	#region GroupMembershipContradictionError class
+	[ModelErrorDisplayFilter(typeof(ElementGroupingErrorCategory))]
 	partial class ElementGroupingMembershipContradictionError
 	{
 		/// <summary>
@@ -1265,6 +1266,14 @@
 				return ResourceStrings.ElementGroupingDefaultNamePattern;
 			}
 			/// <summary>
+			/// Duplicate automatically generated group names should regenerate on load.
+			/// Caters for common merging scenario.
+			/// </summary>
+			protected override bool ShouldResetDuplicateName(ModelElement element, string elementName)
+			{
+				return IsDecoratedRootName(element, elementName);
+			}
+			/// <summary>
 			/// Raise an exception with text specific to a name in a model
 			/// </summary>
 			/// <param name="element">Element we're attempting to name</param>

Modified: trunk/ORMModel/ObjectModel/ORMModel.cs
===================================================================
--- trunk/ORMModel/ObjectModel/ORMModel.cs	2009-03-31 19:25:05 UTC (rev 1375)
+++ trunk/ORMModel/ObjectModel/ORMModel.cs	2009-04-01 01:49:40 UTC (rev 1376)
@@ -1043,6 +1043,14 @@
 				return base.GetRootNamePattern(element);
 			}
 			/// <summary>
+			/// Duplicate automatically generated constraint names should regenerate on load.
+			/// Caters for common merging scenario.
+			/// </summary>
+			protected override bool ShouldResetDuplicateName(ModelElement element, string elementName)
+			{
+				return IsDecoratedRootName(element, elementName);
+			}
+			/// <summary>
 			/// Raise an exception with text specific to a name in a model
 			/// </summary>
 			/// <param name="element">Element we're attempting to name</param>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar (2)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2007	Jan	Feb	Mar	Apr	May	Jun	Jul (2)	Aug (21)	Sep (25)	Oct (13)	Nov	Dec
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (6)	Sep (1)	Oct (1)	Nov (8)	Dec (3)
2009	Jan (5)	Feb (3)	Mar (10)	Apr (6)	May (3)	Jun (4)	Jul (1)	Aug (3)	Sep (5)	Oct (1)	Nov (2)	Dec (2)
2010	Jan	Feb (3)	Mar (2)	Apr (1)	May (1)	Jun (2)	Jul (2)	Aug	Sep (3)	Oct (2)	Nov	Dec
2011	Jan	Feb	Mar	Apr (1)	May	Jun (3)	Jul (1)	Aug	Sep	Oct (2)	Nov (1)	Dec
2012	Jan (1)	Feb	Mar (1)	Apr (1)	May (1)	Jun	Jul	Aug	Sep (1)	Oct (4)	Nov (4)	Dec (2)
2013	Jan (1)	Feb (1)	Mar (1)	Apr (1)	May (2)	Jun	Jul (1)	Aug (1)	Sep	Oct (1)	Nov (3)	Dec (2)
2014	Jan	Feb	Mar	Apr (3)	May (1)	Jun	Jul (2)	Aug (1)	Sep	Oct	Nov (2)	Dec (5)
2015	Jan (3)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (3)	Oct	Nov	Dec
2016	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

orm-commits Mailing List for Object-Role Modeling (Page 5)

orm-commits — This list is notified whenever anything is committed to the SVN repository.