* update

Author: festo-i40

src/AasxPackageLogic/DispEditHelperEntities.cs

@@ -1778,7 +1778,7 @@ public void DisplayOrEditAasEntitySubmodelOrRef(
                 DispSmeListAddNewHelper<ISubmodelElement>(env, stack, repo,
                     key: "SubmodelElement:",
                     submodel.SubmodelElements,
-                    setValueLambda: (sml) => submodel.SubmodelElements = sml,
+                    setOutput: (sml) => submodel.SubmodelElements = sml,
                     superMenu: superMenu,
                     basedOnSemanticId: submodel.SemanticId);
 
@@ -2662,7 +2662,7 @@ public void DisplayOrEditAasEntityOperationVariable(
                 if (parentContainer != null && parentContainer is Aas.Operation operation)
                 {
                     // hope is OK to refer to two lists!
-                    if (operation.InputVariables.Contains(ov))
+                    if (operation.InputVariables?.Contains(ov) == true)
                     {
                         this.EntityListUpDownDeleteHelper<Aas.IOperationVariable>(
                                 stack, repo,
@@ -2671,15 +2671,15 @@ public void DisplayOrEditAasEntityOperationVariable(
                                 ov, 
                                 env, "OperationVariable:");
                     }
-                    else if (operation.OutputVariables.Contains(ov))
+                    else if (operation.OutputVariables?.Contains(ov) == true)
                     {
                         this.EntityListUpDownDeleteHelper<Aas.IOperationVariable>(
                                 stack, repo,
                                 operation.OutputVariables,
                                 (lst) => { operation.OutputVariables = lst; },
                                 ov, env, "OperationVariable:");
                     }
-                    else if (operation.InoutputVariables.Contains(ov))
+                    else if (operation.InoutputVariables?.Contains(ov) == true)
                     {
                         this.EntityListUpDownDeleteHelper<Aas.IOperationVariable>(
                                 stack, repo,
@@ -3223,7 +3223,7 @@ public void DisplayOrEditAasEntitySubmodelElement(
                 DispSmeListAddNewHelper(env, stack, repo,
                     key: "SubmodelElement:",
                     listOfSME,
-                    setValueLambda: (sml) =>
+                    setOutput: (sml) =>
                     {
                         if (sme is Aas.SubmodelElementCollection)
                             (sme as Aas.SubmodelElementCollection).Value = sml;
@@ -3336,7 +3336,8 @@ public void DisplayOrEditAasEntitySubmodelElement(
                         new[] {
                             new HintCheck(
                                 () => { return ovl == null || ovl.Count < 1; },
-                                "This collection of OperationVariables currently has no elements, yet. " +
+                                    "This list of OperationVariables currently has no elements, yet. " +
+                                    (ovl == null ? "List is null! " : "List is empty! ") +
                                     "Please check, which in- and out-variables are required.",
                                 severityLevel: HintCheck.Severity.Notice)
                         });
@@ -3509,7 +3510,7 @@ public void DisplayOrEditAasEntitySubmodelElement(
                 DispSmeListAddNewHelper<IDataElement>(env, stack, repo,
                     key: "annotation:",
                     are.Annotations,
-                    setValueLambda: (sml) => are.Annotations = sml,
+                    setOutput: (sml) => are.Annotations = sml,
                     superMenu: superMenu,
                     basedOnSemanticId: are.SemanticId);
 

src/AasxPackageLogic/DispEditHelperMiniModules.cs

@@ -1841,7 +1841,7 @@ public void DispSmeListAddNewHelper<T>(
             Aas.Environment env,
             AnyUiStackPanel stack, ModifyRepo repo, string key,
             List<T> smeList,
-            Action<List<T>> setValueLambda = null,
+            Action<List<T>> setOutput = null,
             AasxMenu superMenu = null,
             Aas.IReference basedOnSemanticId = null) where T : class, ISubmodelElement
         {
@@ -1856,7 +1856,8 @@ public void DispSmeListAddNewHelper<T>(
 			this.AddHintBubble(stack, hintMode, new[] {
                     new HintCheck(
                         () => { return smeList == null || smeList.Count < 1; },
-                        "This element currently has no SubmodelElements, yet. " +
+                            "This element currently has no SubmodelElements, yet. " +
+                            (smeList == null ? "List is null! " : "List is empty! ") +
                             "These are the actual carriers of information. " +
                             "You could create them by clicking the 'Add ..' buttons below. " +
                             "Subsequently, when having a SubmodelElement established, " +
@@ -1866,24 +1867,29 @@ public void DispSmeListAddNewHelper<T>(
 
             // menu
             var isDataElem = typeof(IDataElement).IsAssignableFrom(typeof(T));
+
+            // 0 and 1
             var menu = new AasxMenu()
                     .AddAction("add-prop", "Add Property",
                         "Adds a new Property to the containing collection.")
                     .AddAction("add-mlp", "Add MultiLang.Prop.",
                         "Adds a new MultiLanguageProperty to the containing collection.");
 
+            // 2
             if (!isDataElem)
                 menu.AddAction("add-smc", "Add Collection",
                    "Adds a new SubmodelElementCollection to the containing collection.");
             else
                 menu.AddAction("add-range", "Add Range",
                    "Adds a new Range to the containing collection.");
 
+            // 3
             menu.AddAction("add-named", "Add other ..",
-                        "Adds a selected kind of SubmodelElement to the containing collection.",
-                        args: new AasxMenuListOfArgDefs()
-                            .Add("Kind", "Name (not abbreviated) of kind of SubmodelElement."));
+                "Adds a selected kind of SubmodelElement to the containing collection.",
+                args: new AasxMenuListOfArgDefs()
+                    .Add("Kind", "Name (not abbreviated) of kind of SubmodelElement."));
 
+            // 4
             if (smtElemItem.Count > 0)
             {
 				menu.AddAction("add-smt-guided", "Add SMT guided ..",
@@ -1935,16 +1941,9 @@ public void DispSmeListAddNewHelper<T>(
                                     defaultHelper: Options.Curr.GetCreateDefaultHelper());
 
                             // add
-                            T smw = sme2;
-                            if (smeList == null)
-                            {
-                                smeList = new List<T>();
-                                setValueLambda?.Invoke(smeList);
-                            }
-
                             smeList = smeList ?? new List<T>();
-                            smeList.Add(smw);
-                            setValueLambda(smeList);
+                            smeList.Add(sme2);
+                            setOutput?.Invoke(smeList);
 
                             // make some more adjustments
                             if (sme2 is IMultiLanguageProperty mlp)
@@ -2007,12 +2006,11 @@ public void DispSmeListAddNewHelper<T>(
                                         item.SmtRec.PopulateReferable(sme, item.Cd);
 
                                         // add & confirm
-                                        var smw = sme as T;
-                                        if (smw != null)
+                                        if (sme != null)
                                         {
                                             smeList = smeList ?? new List<T>();
-                                            smeList.Add(smw);
-                                            setValueLambda(smeList);
+                                            smeList.Add(sme);
+                                            setOutput(smeList);
 
                                             this.AddDiaryEntry(sme, new DiaryEntryStructChange(
                                                 StructuralChangeReason.Create));