staged changes

Author: diskAdmin

Aml.Toolkit/View/TreeViewMultipleSelectionAttached.cs

@@ -458,7 +458,7 @@ private static void SelectMultipleItemsContinuously(TreeView treeView,
  return;
  }
 
- ICollection<TreeViewItem> allItems = new List<TreeViewItem>();
+ ICollection<TreeViewItem> allItems = [];
  GetAllItems(treeView, null, allItems);
  DeSelectAllItems(treeView, null);
  var isBetween = false;

Aml.Toolkit/ViewModel/AMLNodeGroupViewModel.cs

@@ -77,11 +77,9 @@ public AMLNodeGroupViewModel(AMLNodeViewModel parent, bool lazyLoadChildren,
 
  #region Private Fields
 
- private static readonly IEnumerable<string> InterfaceGroup = new List<string>
- { CAEX_CLASSModel_TagNames.EXTERNALINTERFACE_STRING };
+ private static readonly IEnumerable<string> InterfaceGroup = [CAEX_CLASSModel_TagNames.EXTERNALINTERFACE_STRING];
 
- private static readonly IEnumerable<string> RoleRefGroup = new List<string>
- { CAEX_CLASSModel_TagNames.SUPPORTEDROLECLASS_STRING, CAEX_CLASSModel_TagNames.ROLEREQUIREMENTS_STRING };
+ private static readonly IEnumerable<string> RoleRefGroup = [CAEX_CLASSModel_TagNames.SUPPORTEDROLECLASS_STRING, CAEX_CLASSModel_TagNames.ROLEREQUIREMENTS_STRING];
 
  #endregion Private Fields
 
@@ -101,7 +99,7 @@ public AMLNodeGroupViewModel(AMLNodeViewModel parent, bool lazyLoadChildren,
  public IEnumerable<XElement> GroupItems =>
  Parent.IsMirror && Parent.ShowMirrorData && Parent.Master != null
  ? Parent.Master.Node.Elements().Where(e => ElementNames.Contains(e.Name.LocalName))
- : CAEXNode?.Elements().Where(e => ElementNames.Contains(e.Name.LocalName)) ?? Enumerable.Empty<XElement>();
+ : CAEXNode?.Elements().Where(e => ElementNames.Contains(e.Name.LocalName)) ?? [];
 
  /// <summary>
  /// Gets the name of the group.

Aml.Toolkit/ViewModel/AMLNodeViewModel.cs

@@ -997,7 +997,7 @@ public IEnumerable<AMLNodeViewModel> VirtualChildren
  /// The visible children.
  /// </value>
  public IEnumerable<AMLNodeViewModel> VisibleChildren =>
- LoadedChildren?.Where(n => n.IsVisible) ?? Enumerable.Empty<AMLNodeViewModel>();
+ LoadedChildren?.Where(n => n.IsVisible) ?? [];
 
  /// <summary>
  /// Gets the index of the visible node.
@@ -1144,7 +1144,7 @@ public IList<AMLNodeViewModel> LoadedChildrenNotVirtual()
  {
  if (LoadedChildren == null)
  {
- return new List<AMLNodeViewModel>();
+ return [];
  }
 
  return LoadedChildren.Any(x => x is AMLNodeGroupViewModel) ? VirtualChildren.ToList() : LoadedChildren;

Aml.Toolkit/ViewModel/AMLNodeWithClassReference.cs

@@ -42,6 +42,7 @@ public AMLNodeWithClassReference(AMLTreeViewModel tree, AMLNodeViewModel parent,
  base(tree, parent, CaexNode, lazyLoadChildren)
  {
  SetClassPathReferenceAttribute(this);
+ RefreshNodeInformation(false);
  }
 
  /// <summary>
@@ -242,7 +243,7 @@ public bool HasCardinality
  private void SetIsMaster()
  {
  IsMaster = CAEXNode.IsInternalElement()
- ? new InternalElementType(CAEXNode).IsMaster()
+ ? ((InternalElementType)CAEXObject).IsMaster()
  : CAEXNode.IsExternalInterface() && new ExternalInterfaceType(CAEXNode).IsMaster();
  }
 
@@ -521,7 +522,7 @@ private IEnumerable<AMLNodeWithClassReference> GetPartnerNodes(InternalLinkType
  {
  if (il.AInterface == null || il.BInterface == null || Tree?.Root == null)
  {
- return Enumerable.Empty<AMLNodeWithClassReference>();
+ return [];
  }
 
  var partner = il.AInterface.Equals(CAEXObject) ? il.BInterface : il.AInterface;

Aml.Toolkit/ViewModel/AMLTreeViewModel.cs

@@ -904,12 +904,12 @@ static XElement NodeParent (XElement xElement, XElement parent)
 
  if (Root == null)
  {
- return Enumerable.Empty<AMLNodeViewModel>();
+ return [];
  }
 
  if ((e.ChangeMode & CAEXElementChangeMode.ChangedEvent) == CAEXElementChangeMode.None)
  {
- return Enumerable.Empty<AMLNodeViewModel>();
+ return [];
  }
 
  if (e.CAEXElement.Name.LocalName == CAEX_CLASSModel_TagNames.INTERNALLINK_STRING)
@@ -957,15 +957,15 @@ static XElement NodeParent (XElement xElement, XElement parent)
 
  if (xElement == null || !CAEXTagNames.Contains(xElement.Name.LocalName))
  {
- return Enumerable.Empty<AMLNodeViewModel>();
+ return [];
  }
  }
 
  if (e.ChangeMode.HasFlag(CAEXElementChangeMode.Deleted) ||
  e.ChangeMode.HasFlag(CAEXElementChangeMode.Added))
  {
  return Root.CAEXNode == e.CAEXParent
- ? new List<AMLNodeViewModel> { Root }
+ ? [Root]
  : FindTreeViewItemsInTree(Root.Children, NodeParent(e.CAEXParent, e.CAEXParent));
  }
 
@@ -1352,7 +1352,7 @@ private static IEnumerable<XElement> GetModelElements(CAEXWrapper node, HashSet<
 
  if (!expand)
  {
- return Enumerable.Empty<XElement>();
+ return [];
  }
  }
 
@@ -1361,10 +1361,10 @@ private static IEnumerable<XElement> GetModelElements(CAEXWrapper node, HashSet<
  var element = node.Node.Elements().FirstOrDefault(n => names.Contains(n.Name.LocalName));
  if (element == null)
  {
- return Enumerable.Empty<XElement>();
+ return [];
  }
 
- return new List<XElement> { element };
+ return [element];
  }
 
  return node.Node.Elements().Where(n => names.Contains(n.Name.LocalName));
@@ -1392,7 +1392,7 @@ private static IEnumerable<XElement> ModelChilds(CAEXWrapper node, HashSet<strin
  //}
  //else
  //{
- return Enumerable.Empty<XElement>();
+ return [];
  //}
  }
 

Aml.Toolkit/ViewModel/TagnameFindViewModel.cs

@@ -88,7 +88,7 @@ internal IEnumerable<XElement> Query(XElement root, bool onlyWords, bool isCaseS
 
  if (string.IsNullOrEmpty(searchText))
  {
- return Enumerable.Empty<XElement>();
+ return [];
  }
 
  return TagName switch
@@ -153,7 +153,7 @@ RRReference or
  root.Descendants(root.XName(CAEX_CLASSModel_TagNames.ATTRIBUTE_STRING)).Where(lo =>
  lo.Element(lo.XName(CAEX_CLASSModel_TagNames.ATTRIBUTE_VALUE_STRING))?.Value == searchText),
 
- _ => Enumerable.Empty<XElement>()
+ _ => []
  };
  }