Menu
▾
▴
SF.net SVN: orm: [1150] trunk/ORMModel/ObjectModel
|
From: <mcu...@us...> - 2007-10-15 06:14:56
|
Revision: 1150
http://orm.svn.sourceforge.net/orm/?rev=1150&view=rev
Author: mcurland
Date: 2007-10-14 23:15:00 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
Duplicate name errors were not clearing from the model browser. Based all duplicate name error associations on ElementAssociatedWithModelError. Addition to [1037] refs #268
Modified Paths:
--------------
trunk/ORMModel/ObjectModel/GeneratedCode/DomainRelationships.cs
trunk/ORMModel/ObjectModel/ORMCore.dsl
Modified: trunk/ORMModel/ObjectModel/GeneratedCode/DomainRelationships.cs
===================================================================
--- trunk/ORMModel/ObjectModel/GeneratedCode/DomainRelationships.cs 2007-10-15 06:13:14 UTC (rev 1149)
+++ trunk/ORMModel/ObjectModel/GeneratedCode/DomainRelationships.cs 2007-10-15 06:15:00 UTC (rev 1150)
@@ -6026,7 +6026,7 @@
[global::System.CLSCompliant(true)]
[DslModeling::DomainRelationship()]
[DslModeling::DomainObjectId("bc1031eb-8590-4a14-abbd-f12a18622855")]
- public partial class ObjectTypeHasDuplicateNameError : DslModeling::ElementLink
+ public partial class ObjectTypeHasDuplicateNameError : ElementAssociatedWithModelError
{
#region Constructors, domain class Id
@@ -6131,6 +6131,28 @@
return new DslModeling::LinkedElementCollection<ObjectType>(element, DuplicateNameErrorDomainRoleId);
}
#endregion
+ #region AssociatedElement domain role override
+
+ /// <summary>
+ /// Gets the element playing ObjectType domain role.
+ /// Description for
+ /// Neumont.Tools.ORM.ObjectModel.ElementAssociatedWithModelError.AssociatedElement
+ /// </summary>
+ public override global::Microsoft.VisualStudio.Modeling.ModelElement AssociatedElement
+ {
+ [global::System.Diagnostics.DebuggerStepThrough]
+ get
+ {
+ return this.ObjectType;
+ }
+ [global::System.Diagnostics.DebuggerStepThrough]
+ set
+ {
+ this.ObjectType = (ObjectType)value;
+ }
+ }
+
+ #endregion
#region DuplicateNameError domain role code
/// <summary>
@@ -6183,6 +6205,28 @@
DslModeling::DomainRoleInfo.SetLinkedElement(element, ObjectTypeDomainRoleId, newDuplicateNameError);
}
#endregion
+ #region ModelError domain role override
+
+ /// <summary>
+ /// Gets the element playing DuplicateNameError domain role.
+ /// Description for
+ /// Neumont.Tools.ORM.ObjectModel.ElementAssociatedWithModelError.ModelError
+ /// </summary>
+ public override ModelError ModelError
+ {
+ [global::System.Diagnostics.DebuggerStepThrough]
+ get
+ {
+ return this.DuplicateNameError;
+ }
+ [global::System.Diagnostics.DebuggerStepThrough]
+ set
+ {
+ this.DuplicateNameError = (ObjectTypeDuplicateNameError)value;
+ }
+ }
+
+ #endregion
#region ObjectType link accessor
/// <summary>
/// Get the ObjectTypeHasDuplicateNameError link to a ObjectType.
@@ -10173,7 +10217,7 @@
[global::System.CLSCompliant(true)]
[DslModeling::DomainRelationship()]
[DslModeling::DomainObjectId("cb5df90f-3917-4bd1-9807-a24f6d7c52f9")]
- public partial class SetConstraintHasDuplicateNameError : DslModeling::ElementLink
+ public partial class SetConstraintHasDuplicateNameError : ElementAssociatedWithModelError
{
#region Constructors, domain class Id
@@ -10278,6 +10322,28 @@
return new DslModeling::LinkedElementCollection<SetConstraint>(element, DuplicateNameErrorDomainRoleId);
}
#endregion
+ #region AssociatedElement domain role override
+
+ /// <summary>
+ /// Gets the element playing SetConstraint domain role.
+ /// Description for
+ /// Neumont.Tools.ORM.ObjectModel.ElementAssociatedWithModelError.AssociatedElement
+ /// </summary>
+ public override global::Microsoft.VisualStudio.Modeling.ModelElement AssociatedElement
+ {
+ [global::System.Diagnostics.DebuggerStepThrough]
+ get
+ {
+ return this.SetConstraint;
+ }
+ [global::System.Diagnostics.DebuggerStepThrough]
+ set
+ {
+ this.SetConstraint = (SetConstraint)value;
+ }
+ }
+
+ #endregion
#region DuplicateNameError domain role code
/// <summary>
@@ -10330,6 +10396,28 @@
DslModeling::DomainRoleInfo.SetLinkedElement(element, SetConstraintDomainRoleId, newDuplicateNameError);
}
#endregion
+ #region ModelError domain role override
+
+ /// <summary>
+ /// Gets the element playing DuplicateNameError domain role.
+ /// Description for
+ /// Neumont.Tools.ORM.ObjectModel.ElementAssociatedWithModelError.ModelError
+ /// </summary>
+ public override ModelError ModelError
+ {
+ [global::System.Diagnostics.DebuggerStepThrough]
+ get
+ {
+ return this.DuplicateNameError;
+ }
+ [global::System.Diagnostics.DebuggerStepThrough]
+ set
+ {
+ this.DuplicateNameError = (ConstraintDuplicateNameError)value;
+ }
+ }
+
+ #endregion
#region SetConstraint link accessor
/// <summary>
/// Get the SetConstraintHasDuplicateNameError link to a SetConstraint.
@@ -10414,7 +10502,7 @@
[global::System.CLSCompliant(true)]
[DslModeling::DomainRelationship()]
[DslModeling::DomainObjectId("cf7af531-f3d3-42e4-a9f7-d44536da9e53")]
- public partial class SetComparisonConstraintHasDuplicateNameError : DslModeling::ElementLink
+ public partial class SetComparisonConstraintHasDuplicateNameError : ElementAssociatedWithModelError
{
#region Constructors, domain class Id
@@ -10519,6 +10607,28 @@
return new DslModeling::LinkedElementCollection<SetComparisonConstraint>(element, DuplicateNameErrorDomainRoleId);
}
#endregion
+ #region AssociatedElement domain role override
+
+ /// <summary>
+ /// Gets the element playing SetComparisonConstraint domain role.
+ /// Description for
+ /// Neumont.Tools.ORM.ObjectModel.ElementAssociatedWithModelError.AssociatedElement
+ /// </summary>
+ public override global::Microsoft.VisualStudio.Modeling.ModelElement AssociatedElement
+ {
+ [global::System.Diagnostics.DebuggerStepThrough]
+ get
+ {
+ return this.SetComparisonConstraint;
+ }
+ [global::System.Diagnostics.DebuggerStepThrough]
+ set
+ {
+ this.SetComparisonConstraint = (SetComparisonConstraint)value;
+ }
+ }
+
+ #endregion
#region DuplicateNameError domain role code
/// <summary>
@@ -10571,6 +10681,28 @@
DslModeling::DomainRoleInfo.SetLinkedElement(element, SetComparisonConstraintDomainRoleId, newDuplicateNameError);
}
#endregion
+ #region ModelError domain role override
+
+ /// <summary>
+ /// Gets the element playing DuplicateNameError domain role.
+ /// Description for
+ /// Neumont.Tools.ORM.ObjectModel.ElementAssociatedWithModelError.ModelError
+ /// </summary>
+ public override ModelError ModelError
+ {
+ [global::System.Diagnostics.DebuggerStepThrough]
+ get
+ {
+ return this.DuplicateNameError;
+ }
+ [global::System.Diagnostics.DebuggerStepThrough]
+ set
+ {
+ this.DuplicateNameError = (ConstraintDuplicateNameError)value;
+ }
+ }
+
+ #endregion
#region SetComparisonConstraint link accessor
/// <summary>
/// Get the SetComparisonConstraintHasDuplicateNameError link to a SetComparisonConstraint.
Modified: trunk/ORMModel/ObjectModel/ORMCore.dsl
===================================================================
--- trunk/ORMModel/ObjectModel/ORMCore.dsl 2007-10-15 06:13:14 UTC (rev 1149)
+++ trunk/ORMModel/ObjectModel/ORMCore.dsl 2007-10-15 06:15:00 UTC (rev 1150)
@@ -2018,9 +2018,9 @@
</DomainRelationship>
<DomainRelationship Name="ObjectTypeHasDuplicateNameError" Namespace="Neumont.Tools.ORM.ObjectModel" Id="BC1031EB-8590-4A14-ABBD-F12A18622855">
- <!--<BaseRelationship>
- <DomainRelationshipMoniker Name="ORMElementLink"/>
- </BaseRelationship>-->
+ <BaseRelationship>
+ <DomainRelationshipMoniker Name="ElementAssociatedWithModelError"/>
+ </BaseRelationship>
<Source>
<DomainRole Name="ObjectType" PropertyName="DuplicateNameError" Multiplicity="ZeroOne" PropagatesDelete="false" IsPropertyGenerator="true" DisplayName="ObjectType" Id="A2252380-7CAC-4D36-8857-2426AE558C08">
<RolePlayer>
@@ -2338,9 +2338,9 @@
</DomainRelationship>
<DomainRelationship Name="SetConstraintHasDuplicateNameError" Namespace="Neumont.Tools.ORM.ObjectModel" Id="CB5DF90F-3917-4BD1-9807-A24F6D7C52F9">
- <!--<BaseRelationship>
- <DomainRelationshipMoniker Name="ORMElementLink"/>
- </BaseRelationship>-->
+ <BaseRelationship>
+ <DomainRelationshipMoniker Name="ElementAssociatedWithModelError"/>
+ </BaseRelationship>
<Source>
<DomainRole Name="SetConstraint" PropertyName="DuplicateNameError" Multiplicity="ZeroOne" PropagatesDelete="false" IsPropertyGenerator="true" DisplayName="SetConstraint" Id="B4623963-690D-4687-A95E-0FC998AA59EC">
<RolePlayer>
@@ -2358,9 +2358,9 @@
</DomainRelationship>
<DomainRelationship Name="SetComparisonConstraintHasDuplicateNameError" Namespace="Neumont.Tools.ORM.ObjectModel" Id="CF7AF531-F3D3-42E4-A9F7-D44536DA9E53">
- <!--<BaseRelationship>
- <DomainRelationshipMoniker Name="ORMElementLink"/>
- </BaseRelationship>-->
+ <BaseRelationship>
+ <DomainRelationshipMoniker Name="ElementAssociatedWithModelError"/>
+ </BaseRelationship>
<Source>
<DomainRole Name="SetComparisonConstraint" PropertyName="DuplicateNameError" Multiplicity="ZeroOne" PropagatesDelete="false" IsPropertyGenerator="true" DisplayName="SetComparisonConstraint" Id="86A9CB44-0050-4E7C-9DF5-692F980F96EC">
<RolePlayer>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
