From 7d94e5a6908d4f2a7d911fa3879a673f10df846a Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Wed, 12 Feb 2020 01:53:13 -0500 Subject: [PATCH] move XML CommandBar parsing into common CommandItem.FromMarkup function --- .../Common/Reflection.cs | 33 ++----------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Common/Reflection.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Common/Reflection.cs index 5d0b741f..be7a159a 100644 --- a/CSharp/Libraries/UniversalEditor.UserInterface/Common/Reflection.cs +++ b/CSharp/Libraries/UniversalEditor.UserInterface/Common/Reflection.cs @@ -151,7 +151,7 @@ namespace UniversalEditor.UserInterface.Common MarkupTagElement tagItem = (elItem as MarkupTagElement); if (tagItem == null) continue; - CommandItem ci = LoadCommandItem(tagItem); + CommandItem ci = CommandItem.FromMarkup(tagItem); if (ci != null) cmd.Items.Add(ci); } @@ -171,7 +171,7 @@ namespace UniversalEditor.UserInterface.Common MarkupTagElement tagItem = (elItem as MarkupTagElement); if (tagItem == null) continue; - CommandItem ci = LoadCommandItem(tagItem); + CommandItem ci = CommandItem.FromMarkup(tagItem); if (ci != null) { er.MenuBar.Items.Add(ci); @@ -186,35 +186,6 @@ namespace UniversalEditor.UserInterface.Common } } - private static CommandItem LoadCommandItem(MarkupTagElement tagItem) - { - CommandItem ci = null; - MarkupAttribute attInsertBefore = tagItem.Attributes["InsertBefore"]; - MarkupAttribute attInsertAfter = tagItem.Attributes["InsertAfter"]; - switch (tagItem.Name) - { - case "CommandReference": - { - ci = new CommandReferenceCommandItem(tagItem.Attributes["CommandID"]?.Value); - break; - } - case "Separator": - { - ci = new SeparatorCommandItem(); - break; - } - } - - if (ci != null) - { - if (attInsertAfter != null) - ci.InsertAfterID = attInsertAfter.Value; - if (attInsertBefore != null) - ci.InsertBeforeID = attInsertBefore.Value; - } - return ci; - } - private static System.Reflection.Assembly[] mvarAvailableAssemblies = null; private static System.Reflection.Assembly[] GetAvailableAssemblies() {