SF.net SVN: orm: [1138] trunk

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

Revision: 1138
          http://orm.svn.sourceforge.net/orm/?rev=1138&view=rev
Author:   mcurland
Date:     2007-09-20 13:48:24 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
Block property descriptor changes on model-browser selected roles of unary fact types. refs #296
Fixed warning introduced in [1137]. refs #305

Modified Paths:
--------------
    trunk/ORMModel/ObjectModel/Design/RoleTypeDescriptor.cs
    trunk/Tools/DatabaseImport/ORMDatabaseImportWizard.cs

Modified: trunk/ORMModel/ObjectModel/Design/RoleTypeDescriptor.cs
===================================================================
--- trunk/ORMModel/ObjectModel/Design/RoleTypeDescriptor.cs	2007-09-20 20:46:20 UTC (rev 1137)
+++ trunk/ORMModel/ObjectModel/Design/RoleTypeDescriptor.cs	2007-09-20 20:48:24 UTC (rev 1138)
@@ -75,10 +75,24 @@
 		/// </summary>
 		protected override bool IsPropertyDescriptorReadOnly(ElementPropertyDescriptor propertyDescriptor)
 		{
-			if (propertyDescriptor.DomainPropertyInfo.Id == Role.ValueRangeTextDomainPropertyId)
+			Guid propertyId = propertyDescriptor.DomainPropertyInfo.Id;
+			if (propertyId == Role.ValueRangeTextDomainPropertyId)
 			{
 				return !ModelElement.IsValueRole;
 			}
+			else if (propertyId == Role.IsMandatoryDomainPropertyId ||
+				propertyId == Role.RolePlayerDisplayDomainPropertyId ||
+				propertyId == Role.MandatoryConstraintModalityDomainPropertyId ||
+				propertyId == Role.MultiplicityDomainPropertyId)
+			{
+				Role role = ModelElement;
+				if (role is SubtypeMetaRole ||
+					role is SupertypeMetaRole ||
+					null != role.FactType.UnaryRole)
+				{
+					return true;
+				}
+			}
 			return base.IsPropertyDescriptorReadOnly(propertyDescriptor);
 		}
 	}

Modified: trunk/Tools/DatabaseImport/ORMDatabaseImportWizard.cs
===================================================================
--- trunk/Tools/DatabaseImport/ORMDatabaseImportWizard.cs	2007-09-20 20:46:20 UTC (rev 1137)
+++ trunk/Tools/DatabaseImport/ORMDatabaseImportWizard.cs	2007-09-20 20:48:24 UTC (rev 1138)
@@ -196,7 +196,7 @@
 				return;
 			}
 			const int OrcasMajorVersionNumber = 9;
-			const string TemplateWizardAssemblyName = "Microsoft.VisualStudio.TemplateWizard";
+			// UNDONE: See assert where this is used const string TemplateWizardAssemblyName = "Microsoft.VisualStudio.TemplateWizard";
 			const string SuppressOpeningItems = "$__suppress_opening_items__$";
 
 			bool? templateWizardIsOrcasOrLater = TemplateWizardIsOrcasOrLater;


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