[<mcurland@us...>]

Revision: 1360
          http://orm.svn.sourceforge.net/orm/?rev=1360&view=rev
Author:   mcurland
Date:     2009-02-19 05:44:54 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Change UserData keys placed on the toolbox to be strings instead of simple objects. This should allow us to compare these keys across VS sessions and fix the lingering undraggable ValueType issue. refs #385
Also removed the PublicKeyToken for the wix extension assembly from the setup project. The token changes with different Wix versions.

Modified Paths:
--------------
    trunk/ORMModel/ObjectModel/FactType.cs
    trunk/ORMModel/ObjectModel/ORMModel.cs
    trunk/Setup/Setup.wixproj

Modified: trunk/ORMModel/ObjectModel/FactType.cs
===================================================================
--- trunk/ORMModel/ObjectModel/FactType.cs	2009-02-10 03:54:56 UTC (rev 1359)
+++ trunk/ORMModel/ObjectModel/FactType.cs	2009-02-19 05:44:54 UTC (rev 1360)
@@ -420,7 +420,7 @@
 				DomainClassInfo classInfo = Store.DomainDataDirectory.FindDomainClass(rootElement.DomainClassId);
 				if (classInfo.IsDerivedFrom(UniquenessConstraint.DomainClassId))
 				{
-					return elementGroupPrototype.UserData == ORMModel.InternalUniquenessConstraintUserDataKey;
+					return ORMModel.InternalUniquenessConstraintUserDataKey.Equals(elementGroupPrototype.UserData as string);
 				}
 			}
 			return false;

Modified: trunk/ORMModel/ObjectModel/ORMModel.cs
===================================================================
--- trunk/ORMModel/ObjectModel/ORMModel.cs	2009-02-10 03:54:56 UTC (rev 1359)
+++ trunk/ORMModel/ObjectModel/ORMModel.cs	2009-02-19 05:44:54 UTC (rev 1360)
@@ -132,7 +132,7 @@
 		private void MergeRelateObjectType(ModelElement sourceElement, ElementGroup elementGroup)
 		{
 			ObjectType objectType = sourceElement as ObjectType;
-			if (elementGroup.UserData == ORMModel.ValueTypeUserDataKey)
+			if (ORMModel.ValueTypeUserDataKey.Equals(elementGroup.UserData as string))
 			{
 				objectType.DataType = ((ORMModel)this).DefaultDataType;
 			}
@@ -150,7 +150,7 @@
 		}
 		private bool CanMergeSetConstraint(ProtoElementBase rootElement, ElementGroupPrototype elementGroupPrototype)
 		{
-			return elementGroupPrototype.UserData != ORMModel.InternalUniquenessConstraintUserDataKey;
+			return !ORMModel.InternalUniquenessConstraintUserDataKey.Equals(elementGroupPrototype.UserData as string);
 		}
 		#endregion // MergeContext functions
 	}
@@ -161,12 +161,12 @@
 		/// Used as the value for <see cref="ElementGroup.UserData"/> to indicate that the
 		/// <see cref="ObjectType"/> should be a ValueType.
 		/// </summary>
-		public static readonly object ValueTypeUserDataKey = new object();
+		public const string ValueTypeUserDataKey = "CreateAsValueType";
 		/// <summary>
 		/// Used as the value for <see cref="ElementGroup.UserData"/> to indicate that the
 		/// <see cref="UniquenessConstraint"/> is internal.
 		/// </summary>
-		public static readonly object InternalUniquenessConstraintUserDataKey = new object();
+		public const string InternalUniquenessConstraintUserDataKey = "CreateAsInternalUniqueness";
 		#endregion // ElementGroup.UserData keys
 		#region Entity- and ValueType specific collections
 		/// <summary>

Modified: trunk/Setup/Setup.wixproj
===================================================================
--- trunk/Setup/Setup.wixproj	2009-02-10 03:54:56 UTC (rev 1359)
+++ trunk/Setup/Setup.wixproj	2009-02-19 05:44:54 UTC (rev 1360)
@@ -66,7 +66,7 @@
     <Compile Include="UI\WelcomeDlg.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <WixExtension Include="WixVSExtension, Culture=neutral, PublicKeyToken=ce35f76fcda82bad">
+    <WixExtension Include="WixVSExtension, Culture=neutral">
       <Class>Microsoft.Tools.WindowsInstallerXml.Extensions.VSExtension</Class>
       <Private>False</Private>
     </WixExtension>


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