SF.net SVN: orm:[1352] trunk/ORMModel

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

Revision: 1352
          http://orm.svn.sourceforge.net/orm/?rev=1352&view=rev
Author:   mcurland
Date:     2009-01-15 21:59:26 +0000 (Thu, 15 Jan 2009)

Log Message:
-----------
Restore objectified FactType name quotes inadvertently lost for some cases in [1328]. Apparently no one noticed they've been missing for the last two public drops. refs #375

Modified Paths:
--------------
    trunk/ORMModel/Resources/ResourceStringsGenerator.cs
    trunk/ORMModel/Resources/ResourceStringsGenerator.xml
    trunk/ORMModel/ShapeModel/FactTypeShape.cs
    trunk/ORMModel/ShapeModel/ORMDiagram.resx

Modified: trunk/ORMModel/Resources/ResourceStringsGenerator.cs
===================================================================
--- trunk/ORMModel/Resources/ResourceStringsGenerator.cs	2009-01-15 00:26:23 UTC (rev 1351)
+++ trunk/ORMModel/Resources/ResourceStringsGenerator.cs	2009-01-15 21:59:26 UTC (rev 1352)
@@ -2365,6 +2365,22 @@
 				return ResourceStrings.GetString(ResourceManagers.Diagram, "ObjectTypeShape.ReferenceModeFormatString");
 			}
 		}
+		/// <summary>The string used to display an objectified type that is a derived subtype.</summary>
+		public static string ObjectifiedFactTypeNameShapeDerivedSubtypeFormatString
+		{
+			get
+			{
+				return ResourceStrings.GetString(ResourceManagers.Diagram, "ObjectifiedFactTypeNameShape.DerivedSubtypeFormatString");
+			}
+		}
+		/// <summary>The string used to display an objectified type name for an independent object.</summary>
+		public static string ObjectifiedFactTypeNameShapeIndependentFormatString
+		{
+			get
+			{
+				return ResourceStrings.GetString(ResourceManagers.Diagram, "ObjectifiedFactTypeNameShape.IndependentFormatString");
+			}
+		}
 		/// <summary>The string used to display an objectified type name for an derived subtype with a reference mode.</summary>
 		public static string ObjectifiedFactTypeNameShapeRefModeDerivedSubtypeFormatString
 		{
@@ -2389,6 +2405,14 @@
 				return ResourceStrings.GetString(ResourceManagers.Diagram, "ObjectifiedFactTypeNameShape.RefModeFormatString");
 			}
 		}
+		/// <summary>The string used to display an objectified type name.</summary>
+		public static string ObjectifiedFactTypeNameShapeStandardFormatString
+		{
+			get
+			{
+				return ResourceStrings.GetString(ResourceManagers.Diagram, "ObjectifiedFactTypeNameShape.StandardFormatString");
+			}
+		}
 		/// <summary>The string used to divide multiple readings shown in a ReadingShape.</summary>
 		public static string ReadingShapeReadingSeparator
 		{

Modified: trunk/ORMModel/Resources/ResourceStringsGenerator.xml
===================================================================
--- trunk/ORMModel/Resources/ResourceStringsGenerator.xml	2009-01-15 00:26:23 UTC (rev 1351)
+++ trunk/ORMModel/Resources/ResourceStringsGenerator.xml	2009-01-15 21:59:26 UTC (rev 1352)
@@ -343,9 +343,12 @@
 	<ResourceString name="ObjectTypeShapeDerivedSubtypeFormatString" model="Diagram" resourceName="ObjectTypeShape.DerivedSubtypeFormatString"/>
 	<ResourceString name="ObjectTypeShapeIndependentFormatString" model="Diagram" resourceName="ObjectTypeShape.IndependentFormatString"/>
 	<ResourceString name="ObjectTypeShapeReferenceModeFormatString" model="Diagram" resourceName="ObjectTypeShape.ReferenceModeFormatString"/>
+	<ResourceString name="ObjectifiedFactTypeNameShapeDerivedSubtypeFormatString" model="Diagram" resourceName="ObjectifiedFactTypeNameShape.DerivedSubtypeFormatString"/>
+	<ResourceString name="ObjectifiedFactTypeNameShapeIndependentFormatString" model="Diagram" resourceName="ObjectifiedFactTypeNameShape.IndependentFormatString"/>
 	<ResourceString name="ObjectifiedFactTypeNameShapeRefModeDerivedSubtypeFormatString" model="Diagram" resourceName="ObjectifiedFactTypeNameShape.RefModeDerivedSubtypeFormatString"/>
 	<ResourceString name="ObjectifiedFactTypeNameShapeRefModeIndependentFormatString" model="Diagram" resourceName="ObjectifiedFactTypeNameShape.RefModeIndependentFormatString"/>
 	<ResourceString name="ObjectifiedFactTypeNameShapeRefModeFormatString" model="Diagram" resourceName="ObjectifiedFactTypeNameShape.RefModeFormatString"/>
+	<ResourceString name="ObjectifiedFactTypeNameShapeStandardFormatString" model="Diagram" resourceName="ObjectifiedFactTypeNameShape.StandardFormatString"/>
 	<ResourceString name="ReadingShapeReadingSeparator" model="Diagram" resourceName="ReadingShape.ReadingSeparator"/>
 	<ResourceString name="ReadingShapeEllipsis" model="Diagram" resourceName="ReadingShape.Ellipsis"/>
 	<ResourceString name="ReadingShapeAttachedRoleDisplay" model="Diagram" resourceName="ReadingShape.AttachedRoleDisplay"/>

Modified: trunk/ORMModel/ShapeModel/FactTypeShape.cs
===================================================================
--- trunk/ORMModel/ShapeModel/FactTypeShape.cs	2009-01-15 00:26:23 UTC (rev 1351)
+++ trunk/ORMModel/ShapeModel/FactTypeShape.cs	2009-01-15 21:59:26 UTC (rev 1352)
@@ -5698,12 +5698,16 @@
 					}
 					else if (independent)
 					{
-						formatString = ResourceStrings.ObjectTypeShapeIndependentFormatString;
+						formatString = ResourceStrings.ObjectifiedFactTypeNameShapeIndependentFormatString;
 					}
 					else if (derived)
 					{
-						formatString = ResourceStrings.ObjectTypeShapeIndependentFormatString;
+						formatString = ResourceStrings.ObjectifiedFactTypeNameShapeDerivedSubtypeFormatString;
 					}
+					else
+					{
+						formatString = ResourceStrings.ObjectifiedFactTypeNameShapeStandardFormatString;
+					}
 				}
 				return (formatString == null) ? baseText : string.Format(CultureInfo.InvariantCulture, formatString, baseText, refModeString);
 			}

Modified: trunk/ORMModel/ShapeModel/ORMDiagram.resx
===================================================================
--- trunk/ORMModel/ShapeModel/ORMDiagram.resx	2009-01-15 00:26:23 UTC (rev 1351)
+++ trunk/ORMModel/ShapeModel/ORMDiagram.resx	2009-01-15 21:59:26 UTC (rev 1352)
@@ -563,6 +563,14 @@
     <value xml:space="preserve">({0})</value>
     <comment xml:space="preserve">The string used to display a reference mode.</comment>
   </data>
+  <data name="ObjectifiedFactTypeNameShape.DerivedSubtypeFormatString">
+    <value xml:space="preserve">"{0} *"</value>
+    <comment xml:space="preserve">The string used to display an objectified type that is a derived subtype.</comment>
+  </data>
+  <data name="ObjectifiedFactTypeNameShape.IndependentFormatString">
+    <value xml:space="preserve">"{0} !"</value>
+    <comment xml:space="preserve">The string used to display an objectified type name for an independent object.</comment>
+  </data>
   <data name="ObjectifiedFactTypeNameShape.RefModeDerivedSubtypeFormatString">
     <value xml:space="preserve">"{0} ({1})*"</value>
     <comment xml:space="preserve">The string used to display an objectified type name for an derived subtype with a reference mode.</comment>
@@ -575,6 +583,10 @@
     <value xml:space="preserve">"{0} ({1})"</value>
     <comment xml:space="preserve">The string used to display an objectified type name for an object with a reference mode.</comment>
   </data>
+  <data name="ObjectifiedFactTypeNameShape.StandardFormatString">
+    <value xml:space="preserve">"{0}"</value>
+    <comment xml:space="preserve">The string used to display an objectified type name.</comment>
+  </data>
   <data name="ObjectifyFactType.TransactionName">
     <value xml:space="preserve">Objectify Fact Type</value>
     <comment xml:space="preserve">The name given to the transaction used when objectifying a fact type.</comment>


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