SF.net SVN: orm: [1158] trunk/ORMModel/ObjectModel/SurveyImplementations/ FactTypeAnswers.cs

[<mcu...@us...>]

Revision: 1158
          http://orm.svn.sourceforge.net/orm/?rev=1158&view=rev
Author:   mcurland
Date:     2007-10-14 23:51:21 -0700 (Sun, 14 Oct 2007)

Log Message:
-----------
Always display the generated FactType name for an objectified fact type in the "Fact Types" branch of ORM Model Browser instead of the associated ObjectType name. Requested by Terry. refs #268

Modified Paths:
--------------
    trunk/ORMModel/ObjectModel/SurveyImplementations/FactTypeAnswers.cs

Modified: trunk/ORMModel/ObjectModel/SurveyImplementations/FactTypeAnswers.cs
===================================================================
--- trunk/ORMModel/ObjectModel/SurveyImplementations/FactTypeAnswers.cs	2007-10-15 06:49:40 UTC (rev 1157)
+++ trunk/ORMModel/ObjectModel/SurveyImplementations/FactTypeAnswers.cs	2007-10-15 06:51:21 UTC (rev 1158)
@@ -91,16 +91,24 @@
 		{
 			get
 			{
-				string retVal = this.Name;
-				if (string.IsNullOrEmpty(retVal))
+				string retVal;
+				if (Objectification != null)
 				{
-					// UNDONE: MattCurland: We're getting this during redo scenarios on objectified facts.
-					// This is a bug in the Name propery implementation, which should handle
-					// this transparently. The sequencing here is very tricky because it involves
-					// synchronizing the FactType and ObjectType namds. I don't want to destabilize
-					// that scenario for this case, so I'm just regenerating the name.
-					retVal = GenerateName();
+					retVal = this.GenerateName();
 				}
+				else
+				{
+					retVal = this.Name;
+					if (string.IsNullOrEmpty(retVal))
+					{
+						// UNDONE: MattCurland: We're getting this during redo scenarios on objectified facts.
+						// This is a bug in the Name propery implementation, which should handle
+						// this transparently. The sequencing here is very tricky because it involves
+						// synchronizing the FactType and ObjectType namds. I don't want to destabilize
+						// that scenario for this case, so I'm just regenerating the name.
+						retVal = GenerateName();
+					}
+				}
 				return retVal;
 			}
 		}


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