https://github.com/msawczyn/EFDesigner/issues/108

msawczyn · Oct 16, 2019 · 0b45f00 · 0b45f00
1 parent 0290afc
commit 0b45f00
Show file tree

Hide file tree

Showing 11 changed files with 132 additions and 252 deletions.
diff --git a/src/Dsl/CustomCode/Rules/AssociationAddRules.cs b/src/Dsl/CustomCode/Rules/AssociationAddRules.cs
@@ -71,6 +71,7 @@ public override void ElementAdded(ElementAddedEventArgs e)
          }
 
          AssociationChangeRules.SetEndpointRoles(element);
+         AssociationChangeRules.UpdateDisplayForCascadeDelete(element);
       }
    }
 }
diff --git a/src/Dsl/CustomCode/Rules/AssociationChangeRules.cs b/src/Dsl/CustomCode/Rules/AssociationChangeRules.cs
@@ -89,7 +89,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
 
             case "SourceDeleteAction":
                DeleteAction sourceDeleteAction = (DeleteAction)e.NewValue;
-               UpdateDisplayForCascadeDelete(element, sourceDeleteAction);
+               UpdateDisplayForCascadeDelete(element, sourceDeleteAction : sourceDeleteAction);
 
                break;
 
@@ -125,7 +125,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
                else
                   SetEndpointRoles(element);
 
-               UpdateDisplayForCascadeDelete(element, null, null, sourceMultiplicity);
+               UpdateDisplayForCascadeDelete(element, sourceMultiplicity : sourceMultiplicity);
 
                break;
 
@@ -174,7 +174,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
 
             case "TargetDeleteAction":
                DeleteAction targetDeleteAction = (DeleteAction)e.NewValue;
-               UpdateDisplayForCascadeDelete(element, null, targetDeleteAction);
+               UpdateDisplayForCascadeDelete(element, targetDeleteAction : targetDeleteAction);
 
                break;
 
@@ -203,7 +203,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
                else
                   SetEndpointRoles(element);
 
-               UpdateDisplayForCascadeDelete(element, null, null, null, newTargetMultiplicity);
+               UpdateDisplayForCascadeDelete(element, targetMultiplicity : newTargetMultiplicity);
 
                break;
 

diff --git a/src/Dsl/CustomCode/Rules/ModelRootChangeRules.cs b/src/Dsl/CustomCode/Rules/ModelRootChangeRules.cs
@@ -117,9 +117,9 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
                // so we need to set this early -- requires guarding against recursion.
                bool newShowCascadeDeletes = (bool)e.NewValue;
 
-               if (element.ShowCascadeDeletes != newShowCascadeDeletes)
+               //if (element.ShowCascadeDeletes != newShowCascadeDeletes)
                {
-                  element.ShowCascadeDeletes = newShowCascadeDeletes;
+                  //element.ShowCascadeDeletes = newShowCascadeDeletes;
 
                   foreach (Association association in store.ElementDirectory.FindElements<Association>())
                      AssociationChangeRules.UpdateDisplayForCascadeDelete(association);

diff --git a/src/Dsl/DslDefinition.dsl b/src/Dsl/DslDefinition.dsl
@@ -1559,12 +1559,12 @@
   <Connectors>
     <Connector Id="6b6c3915-4ad2-4118-ab70-d1adf80dc3ba" Description="" Name="AssociationConnector" DisplayName="Association Connector" InheritanceModifier="Abstract" Namespace="Sawczyn.EFDesigner.EFModel" GeneratesDoubleDerived="true" FixedTooltipText="Association Connector" Color="113, 111, 110" Thickness="0.01" ExposesColorAsProperty="true" ExposesDashStyleAsProperty="true">
       <Properties>
-        <DomainProperty Id="87700344-4a49-4734-b376-47dd7ec79b24" Description="No description available" Name="Color" DisplayName="Color" Kind="CustomStorage" IsBrowsable="false">
+        <DomainProperty Id="87700344-4a49-4734-b376-47dd7ec79b24" Description="No description available" Name="Color" DisplayName="Color" Kind="Calculated" IsBrowsable="false">
           <Type>
             <ExternalTypeMoniker Name="/System.Drawing/Color" />
           </Type>
         </DomainProperty>
-        <DomainProperty Id="657f50bd-4284-4ec3-bc1d-7dcdf731ab62" Description="No description available" Name="DashStyle" DisplayName="Dash Style" Kind="CustomStorage" IsBrowsable="false">
+        <DomainProperty Id="657f50bd-4284-4ec3-bc1d-7dcdf731ab62" Description="No description available" Name="DashStyle" DisplayName="Dash Style" Kind="Calculated" IsBrowsable="false">
           <Type>
             <ExternalTypeMoniker Name="/System.Drawing.Drawing2D/DashStyle" />
           </Type>
@@ -2041,10 +2041,10 @@
       <XmlClassData TypeName="AssociationConnector" MonikerAttributeName="" SerializeId="true" MonikerElementName="associationConnectorMoniker" ElementName="associationConnector" MonikerTypeName="AssociationConnectorMoniker">
         <ConnectorMoniker Name="AssociationConnector" />
         <ElementData>
-          <XmlPropertyData XmlName="color">
+          <XmlPropertyData XmlName="color" Representation="Ignore">
             <DomainPropertyMoniker Name="AssociationConnector/Color" />
           </XmlPropertyData>
-          <XmlPropertyData XmlName="dashStyle">
+          <XmlPropertyData XmlName="dashStyle" Representation="Ignore">
             <DomainPropertyMoniker Name="AssociationConnector/DashStyle" />
           </XmlPropertyData>
         </ElementData>