Fix model load error

msawczyn · Jan 30, 2020 · f674c3a · f674c3a
1 parent 5284cc9
commit f674c3a
Show file tree

Hide file tree

Showing 16 changed files with 167 additions and 133 deletions.
diff --git a/src/Dsl/CustomCode/Partials/ModelClass.cs b/src/Dsl/CustomCode/Partials/ModelClass.cs
@@ -403,7 +403,10 @@ public IEnumerable<NavigationProperty> LocalNavigationProperties(params Associat
       private void SetBaseClassValue(string newValue)
       {
          ModelClass baseClass = Store.ElementDirectory.FindElements<ModelClass>().FirstOrDefault(x => x.Name == newValue);
-         Superclass = baseClass;
+         Superclass?.Subclasses?.Remove(this);
+         baseClass?.Subclasses?.Add(this);
+         //Superclass = null;
+         //Superclass = baseClass;
       }
 
       #region Validations

diff --git a/src/Dsl/Dsl.csproj b/src/Dsl/Dsl.csproj
@@ -354,6 +354,7 @@
     <Content Include="Resources\cardinality-many-many.png" />
     <Content Include="Resources\EnumValue.png" />
     <None Include="Resources\Move.cur" />
+    <Content Include="Resources\No.png" />
     <Content Include="Resources\TransientClass.png" />
     <Content Include="Resources\Warning.png" />
     <None Include="DslDefinition.dsl.diagram">

diff --git a/src/Dsl/DslDefinition.dsl b/src/Dsl/DslDefinition.dsl
@@ -1565,6 +1565,9 @@
       <ShapeHasDecorators Position="InnerTopLeft" HorizontalOffset="0" VerticalOffset="0">
         <IconDecorator Name="TransientGlyph" DisplayName="Transient Glyph" DefaultIcon="Resources\TransientClass.png" />
       </ShapeHasDecorators>
+      <ShapeHasDecorators Position="InnerTopLeft" HorizontalOffset="16" VerticalOffset="0">
+        <IconDecorator Name="NoGenGlyph" DisplayName="No Code Generation" DefaultIcon="Resources\No.png" />
+      </ShapeHasDecorators>
       <Compartment Name="AttributesCompartment" Title="Properties" />
       <Compartment Name="AssociationsCompartment" Title="Association Targets" />
       <Compartment Name="SourcesCompartment" Title="Association Sources" />
@@ -1611,13 +1614,16 @@
         <TextDecorator Name="Name" DisplayName="Name" DefaultText="Name" />
       </ShapeHasDecorators>
       <ShapeHasDecorators Position="InnerTopRight" HorizontalOffset="0" VerticalOffset="0">
-        <ExpandCollapseDecorator Name="ExpandCollapse" DisplayName="Expand Collapse" />
+        <ExpandCollapseDecorator Name="ExpandCollapse" DisplayName="Expand/Collapse" />
       </ShapeHasDecorators>
       <ShapeHasDecorators Position="InnerTopLeft" HorizontalOffset="0" VerticalOffset="0">
-        <IconDecorator Name="EnumGlyph" DisplayName="Enum Glyph" DefaultIcon="Resources\EnumTool.bmp" />
+        <IconDecorator Name="EnumGlyph" DisplayName="Enumeration" DefaultIcon="Resources\EnumTool.bmp" />
       </ShapeHasDecorators>
       <ShapeHasDecorators Position="InnerTopLeft" HorizontalOffset="0" VerticalOffset="0">
-        <IconDecorator Name="WarningGlyph" DisplayName="Warning Glyph" DefaultIcon="Resources\Warning.png" />
+        <IconDecorator Name="WarningGlyph" DisplayName="Warning" DefaultIcon="Resources\Warning.png" />
+      </ShapeHasDecorators>
+      <ShapeHasDecorators Position="InnerTopLeft" HorizontalOffset="16" VerticalOffset="0">
+        <IconDecorator Name="NoGenGlyph" DisplayName="No Code Generation" DefaultIcon="Resources\No.png" />
       </ShapeHasDecorators>
       <Compartment Name="ValuesCompartment" Title="Values" />
     </CompartmentShape>
@@ -1949,7 +1955,7 @@
           <XmlPropertyData XmlName="summary">
             <DomainPropertyMoniker Name="ModelClass/Summary" />
           </XmlPropertyData>
-          <XmlPropertyData XmlName="baseClass">
+          <XmlPropertyData XmlName="baseClass" Representation="Ignore">
             <DomainPropertyMoniker Name="ModelClass/BaseClass" />
           </XmlPropertyData>
           <XmlPropertyData XmlName="customAttributes">
@@ -2467,6 +2473,15 @@
             </PropertyFilters>
           </VisibilityPropertyPath>
         </DecoratorMap>
+        <DecoratorMap>
+          <IconDecoratorMoniker Name="ClassShape/NoGenGlyph" />
+          <VisibilityPropertyPath>
+            <DomainPropertyMoniker Name="ModelClass/GenerateCode" />
+            <PropertyFilters>
+              <PropertyFilter FilteringValue="False" />
+            </PropertyFilters>
+          </VisibilityPropertyPath>
+        </DecoratorMap>
         <CompartmentShapeMoniker Name="ClassShape" />
         <CompartmentMap DisplaysCustomString="true">
           <CompartmentMoniker Name="ClassShape/AttributesCompartment" />
@@ -2550,6 +2565,15 @@
             </PropertyFilters>
           </VisibilityPropertyPath>
         </DecoratorMap>
+        <DecoratorMap>
+          <IconDecoratorMoniker Name="EnumShape/NoGenGlyph" />
+          <VisibilityPropertyPath>
+            <DomainPropertyMoniker Name="ModelEnum/GenerateCode" />
+            <PropertyFilters>
+              <PropertyFilter FilteringValue="False" />
+            </PropertyFilters>
+          </VisibilityPropertyPath>
+        </DecoratorMap>
         <CompartmentShapeMoniker Name="EnumShape" />
         <CompartmentMap DisplaysCustomString="true">
           <CompartmentMoniker Name="EnumShape/ValuesCompartment" />