fix renaming label error

Author: circles-arrows

Blueprint41.Modeller/Program.cs

@@ -13,15 +13,15 @@ static class Program
         static void Main()
         {
             // Add the event handler for handling UI thread exceptions to the event.
-            Application.ThreadException += Application_ThreadException;           
+            Application.ThreadException += Application_ThreadException;
 
             // Set the unhandled exception mode to force all Windows Forms errors to go through
             // our handler.
             Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
 
             // Add the event handler for handling non-UI thread exceptions to the event. 
             AppDomain.CurrentDomain.UnhandledException +=
-                new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+                new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);            
 
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
@@ -49,8 +49,8 @@ private static void Application_ThreadException(object sender, System.Threading.
             }
 
             // Exits the program when the user clicks Abort.
-            if (result == DialogResult.Abort)
-                Application.Exit();
+            //if (result == DialogResult.Abort)
+            //    Application.Exit();
         }
 
         static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
@@ -61,6 +61,8 @@ static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEv
                 string errorMsg = "An application error occurred. Please contact support@circles-arrows.com  " +
                     "with the following information:\n\n";
 
+                ShowThreadExceptionDialog("Blueprint41 Modeller Error", ex);
+
                 // Since we can't prevent the app from terminating, log this to the event log.
                 if (!EventLog.SourceExists("ThreadException"))
                 {

Blueprint41.Modeller/Schemas/Logic/Entity.cs

@@ -206,7 +206,7 @@ protected override void InitializeLogic()
                             relationship.Target.ReferenceGuid = newGuid;
                         }
                     }
-
+                    
                     Guid = newGuid;
                 }
             };
@@ -253,7 +253,7 @@ protected override void InitializeLogic()
                     ClearStaticData();
             };
         }
-
+                
         private void CreateStaticData()
         {
             if (Xml.@staticData == null)

Blueprint41.Modeller/Schemas/Logic/Submodel.cs

@@ -97,33 +97,17 @@ protected override void InitializeLogic()
             {
                 OnLabelChanged += delegate (object sender, PropertyChangedEventArgs<string> e)
                 {
-                    entitiesLookUp?.Clear();
                 };
             }
 
-
-            private Dictionary<string, Entity> entitiesLookUp = new Dictionary<string, Entity>();
             public Entity Entity
             {
                 get
                 {
                     if (Model == null)
                         return null;
 
-                    Entity entity;
-                    try
-                    {
-                        if (entitiesLookUp.Count == 0)
-                            entitiesLookUp = Model.Entities.Entity.ToDictionary(x => x.Label, y => y);
-
-                        entity = entitiesLookUp[Label];
-                    }
-                    catch (Exception)
-                    {
-                        throw new Exception(string.Format("'{0}' exists in <submodels> but does not exist in <entities>. Remove all '{1}' references from all <submodels>", Label, Label));
-                    }
-
-                    return entity;
+                    return Model.Entities.Entity.First(item => item.Label == Label);
                 }
                 set
                 {