Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor MenuCommandService to use List<T> instead of ArrayList #8183

Merged
merged 2 commits into from
Nov 16, 2022
Merged

Refactor MenuCommandService to use List<T> instead of ArrayList #8183

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d61b51d
Refactor MenuCommandService to use List<T> instead of ArrayList
elachlan Nov 14, 2022
34435a3
changes from review
elachlan Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 27 additions & 34 deletions src/System.Windows.Forms.Design/src/System/ComponentModel/Design/MenuCommandService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ namespace System.ComponentModel.Design
public class MenuCommandService : IMenuCommandService, IDisposable
{
private IServiceProvider _serviceProvider;
private readonly Dictionary<Guid, ArrayList> _commandGroups;
private readonly Dictionary<Guid, List<MenuCommand>> _commandGroups;
private readonly object _commandGroupsLock;
private readonly EventHandler _commandChangedHandler;
private MenuCommandsChangedEventHandler _commandsChangedHandler;
private ArrayList _globalVerbs;
private List<DesignerVerb> _globalVerbs;
private ISelectionService _selectionService;

internal static TraceSwitch MENUSERVICE = new TraceSwitch("MENUSERVICE", "MenuCommandService: Track menu command routing");
Expand All @@ -46,7 +46,7 @@ public MenuCommandService(IServiceProvider serviceProvider)
{
_serviceProvider = serviceProvider;
_commandGroupsLock = new object();
_commandGroups = new Dictionary<Guid, ArrayList>();
_commandGroups = new();
_commandChangedHandler = new EventHandler(OnCommandChanged);
TypeDescriptor.Refreshed += new RefreshEventHandler(OnTypeRefreshed);
}
Expand Down Expand Up @@ -97,13 +97,14 @@ public virtual void AddCommand(MenuCommand command)
throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, SR.MenuCommandService_DuplicateCommand, command.CommandID.ToString()));
}

ArrayList commandsList;
lock (_commandGroupsLock)
{
if (!_commandGroups.TryGetValue(command.CommandID.Guid, out commandsList))
if (!_commandGroups.TryGetValue(command.CommandID.Guid, out List<MenuCommand> commandsList))
{
commandsList = new ArrayList();
commandsList.Add(command);
commandsList = new()
{
command
};
_commandGroups.Add(command.CommandID.Guid, commandsList);
}
else
Expand All @@ -129,8 +130,7 @@ public virtual void AddVerb(DesignerVerb verb)
{
ArgumentNullException.ThrowIfNull(verb);

_globalVerbs ??= new ArrayList();

_globalVerbs ??= new();
_globalVerbs.Add(verb);
OnCommandsChanged(new MenuCommandsChangedEventArgs(MenuCommandsChangedType.CommandAdded, verb));
EnsureVerbs();
Expand Down Expand Up @@ -169,9 +169,9 @@ protected virtual void Dispose(bool disposing)

lock (_commandGroupsLock)
{
foreach (KeyValuePair<Guid, ArrayList> group in _commandGroups)
foreach (KeyValuePair<Guid, List<MenuCommand>> group in _commandGroups)
{
ArrayList commands = group.Value;
List<MenuCommand> commands = group.Value;
foreach (MenuCommand command in commands)
{
command.CommandChanged -= _commandChangedHandler;
Expand All @@ -195,9 +195,6 @@ protected void EnsureVerbs()

if (_currentVerbs is null && _serviceProvider is not null)
{
Hashtable buildVerbs = null;
ArrayList verbsOrder;

if (_selectionService is null)
{
_selectionService = GetService(typeof(ISelectionService)) as ISelectionService;
Expand Down Expand Up @@ -279,16 +276,17 @@ protected void EnsureVerbs()
}

// merge all
buildVerbs = new Hashtable(verbCount, StringComparer.OrdinalIgnoreCase);
verbsOrder = new ArrayList(verbCount);
Dictionary<string, int> buildVerbs = new(verbCount, StringComparer.OrdinalIgnoreCase);
List<DesignerVerb> verbsOrder = new();

// PRIORITY ORDER FROM HIGH TO LOW: LOCAL VERBS - DESIGNERACTION VERBS - GLOBAL VERBS
if (useGlobalVerbs)
{
for (int i = 0; i < _globalVerbs.Count; i++)
{
string key = ((DesignerVerb)_globalVerbs[i]).Text;
buildVerbs[key] = verbsOrder.Add(_globalVerbs[i]);
string key = _globalVerbs[i].Text;
verbsOrder.Add(_globalVerbs[i]);
buildVerbs[key] = verbsOrder.Count - 1;
}
}

Expand All @@ -297,7 +295,8 @@ protected void EnsureVerbs()
for (int i = 0; i < designerActionVerbs.Count; i++)
{
string key = designerActionVerbs[i].Text;
buildVerbs[key] = verbsOrder.Add(designerActionVerbs[i]);
verbsOrder.Add(designerActionVerbs[i]);
buildVerbs[key] = verbsOrder.Count - 1;
}
}

Expand All @@ -306,7 +305,8 @@ protected void EnsureVerbs()
for (int i = 0; i < localVerbs.Count; i++)
{
string key = localVerbs[i].Text;
buildVerbs[key] = verbsOrder.Add(localVerbs[i]);
verbsOrder.Add(localVerbs[i]);
buildVerbs[key] = verbsOrder.Count - 1;
}
}

Expand All @@ -315,16 +315,16 @@ protected void EnsureVerbs()
int j = 0;
for (int i = 0; i < verbsOrder.Count; i++)
{
DesignerVerb value = (DesignerVerb)verbsOrder[i];
DesignerVerb value = verbsOrder[i];
string key = value.Text;
if ((int)buildVerbs[key] == i)
if (buildVerbs[key] == i)
{ // there's not been a duplicate for this entry
result[j] = value;
j++;
}
}

_currentVerbs = new DesignerVerbCollection(result);
_currentVerbs = new(result);
}
}

Expand All @@ -346,7 +346,7 @@ protected MenuCommand FindCommand(Guid guid, int id)
Debug.WriteLineIf(MENUSERVICE.TraceVerbose, "MCS Searching for command: " + guid.ToString() + " : " + id.ToString(CultureInfo.CurrentCulture));

// Search in the list of commands only if the command group is known
ArrayList commands;
List<MenuCommand> commands;
lock (_commandGroupsLock)
{
_commandGroups.TryGetValue(guid, out commands);
Expand Down Expand Up @@ -413,7 +413,7 @@ protected MenuCommand FindCommand(Guid guid, int id)
/// </summary>
protected ICollection GetCommandList(Guid guid)
{
ArrayList commands = null;
List<MenuCommand> commands = null;
lock (_commandGroupsLock)
{
_commandGroups.TryGetValue(guid, out commands);
Expand All @@ -427,13 +427,7 @@ protected ICollection GetCommandList(Guid guid)
protected object GetService(Type serviceType)
{
ArgumentNullException.ThrowIfNull(serviceType);

if (_serviceProvider is not null)
{
return _serviceProvider.GetService(serviceType);
}

return null;
return _serviceProvider?.GetService(serviceType);
}

/// <summary>
Expand Down Expand Up @@ -526,10 +520,9 @@ public virtual void RemoveCommand(MenuCommand command)
{
ArgumentNullException.ThrowIfNull(command);

ArrayList commands;
lock (_commandGroupsLock)
{
if (_commandGroups.TryGetValue(command.CommandID.Guid, out commands))
if (_commandGroups.TryGetValue(command.CommandID.Guid, out List<MenuCommand> commands))
{
int index = commands.IndexOf(command);
if (-1 != index)
Expand Down