Fixes for enum deletion

msawczyn · Mar 15, 2020 · 90a074e · 90a074e
1 parent 21a024c
commit 90a074e
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 9 deletions.
diff --git a/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix b/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix
diff --git a/src/Dsl/CustomCode/Partials/EFModelDiagram.cs b/src/Dsl/CustomCode/Partials/EFModelDiagram.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Linq;
 using System.Windows.Forms;
 
@@ -40,7 +41,14 @@ private bool IsAcceptableDropItem(DiagramDragEventArgs diagramDragEventArgs)
 
       public override void OnDragDrop(DiagramDragEventArgs diagramDragEventArgs)
       {
-         base.OnDragDrop(diagramDragEventArgs);
+         try
+         {
+            base.OnDragDrop(diagramDragEventArgs);
+         }
+         catch (ArgumentException e)
+         {
+            // ignore. byproduct of multiple diagrams
+         }
 
          if (IsDropping)
          {
@@ -60,7 +68,16 @@ public override void OnDragDrop(DiagramDragEventArgs diagramDragEventArgs)
                missingFiles = filenames.Except(existingFiles).ToArray();
             }
             else
-               base.OnDragDrop(diagramDragEventArgs);
+            {
+               try
+               {
+                  base.OnDragDrop(diagramDragEventArgs);
+               }
+               catch (ArgumentException e)
+               {
+                  // ignore. byproduct of multiple diagrams
+               }
+            }
 
             if (missingFiles != null && missingFiles.Any())
             {

diff --git a/src/Dsl/CustomCode/Rules/ModelEnumDeleteRules.cs b/src/Dsl/CustomCode/Rules/ModelEnumDeleteRules.cs
@@ -27,7 +27,7 @@ public override void ElementDeleting(ElementDeletingEventArgs e)
          if (current.IsSerializing || ModelRoot.BatchUpdating)
             return;
 
-         string fullName = element.FullName;
+         string fullName = element.FullName.Split('.').Last();
 
          using (Transaction t1 = store.TransactionManager.BeginTransaction("Remove enum properties"))
          {

diff --git a/src/DslPackage/CustomCode/CommandSet.cs b/src/DslPackage/CustomCode/CommandSet.cs
@@ -154,10 +154,13 @@ protected override void ProcessOnMenuDeleteCommand()
       {
          foreach (EnumShape enumShape in CurrentSelection.OfType<EnumShape>())
          {
-            if (enumShape.ModelElement is ModelEnum modelEnum 
-             && ModelEnum.IsUsed(modelEnum) 
-             && BooleanQuestionDisplay.Show($"{modelEnum.FullName} is used as an entity property. Deleting the enumeration will remove those properties. Are you sure?") != true)
-               return;
+            if (enumShape.ModelElement is ModelEnum modelEnum && ModelEnum.IsUsed(modelEnum))
+            {
+               string fullName = modelEnum.FullName.Split('.').Last();
+
+               if (BooleanQuestionDisplay.Show($"{fullName} is used as an entity property. Deleting the enumeration will remove those properties. Are you sure?") != true)
+                  return;
+            }
          }
 
          base.ProcessOnMenuDeleteCommand();