Index: Core/Common/src/Core.Common.Gui/Commands/IImportCommandHandler.cs =================================================================== diff -u -r65f5b28d47b6d27e40f677108c6f56bf2120906c -r1bcda67a71749b693cf0ce1e957cac43db691dce --- Core/Common/src/Core.Common.Gui/Commands/IImportCommandHandler.cs (.../IImportCommandHandler.cs) (revision 65f5b28d47b6d27e40f677108c6f56bf2120906c) +++ Core/Common/src/Core.Common.Gui/Commands/IImportCommandHandler.cs (.../IImportCommandHandler.cs) (revision 1bcda67a71749b693cf0ce1e957cac43db691dce) @@ -47,6 +47,8 @@ /// /// /// The data object to import to. - void ImportOn(object target); + /// The instances representing the importers available + /// for the target object. + void ImportOn(object target, IEnumerable importInfos); } } \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs =================================================================== diff -u -r74fa4b3189b50ed683febfeee2275ab1d0274f88 -r1bcda67a71749b693cf0ce1e957cac43db691dce --- Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs (.../GuiContextMenuItemFactory.cs) (revision 74fa4b3189b50ed683febfeee2275ab1d0274f88) +++ Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs (.../GuiContextMenuItemFactory.cs) (revision 1bcda67a71749b693cf0ce1e957cac43db691dce) @@ -206,7 +206,7 @@ Enabled = importInfos.Any() }; - importItem.Click += (s, e) => importCommandHandler.ImportOn(dataObject); + importItem.Click += (s, e) => importCommandHandler.ImportOn(dataObject, importInfos); return importItem; } Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs =================================================================== diff -u -re353e42767fbcbb99974cbf3224ebcd4714c2196 -r1bcda67a71749b693cf0ce1e957cac43db691dce --- Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs (.../GuiContextMenuItemFactoryTest.cs) (revision e353e42767fbcbb99974cbf3224ebcd4714c2196) +++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs (.../GuiContextMenuItemFactoryTest.cs) (revision 1bcda67a71749b693cf0ce1e957cac43db691dce) @@ -345,17 +345,18 @@ var viewCommands = mocks.StrictMock(); var nodeData = new object(); - importCommandHandler.Expect(ch => ch.GetSupportedImportInfos(nodeData)) - .Return(hasImportersForNodeData - ? new[] - { - new ImportInfo() - } - : new ImportInfo[0]); + ImportInfo[] importInfos = hasImportersForNodeData + ? new[] + { + new ImportInfo() + } + : new ImportInfo[0]; + importCommandHandler.Expect(ich => ich.GetSupportedImportInfos(nodeData)).Return(importInfos); + if (hasImportersForNodeData) { - importCommandHandler.Expect(ch => ch.ImportOn(nodeData)); + importCommandHandler.Expect(ich => ich.ImportOn(nodeData, importInfos)); } mocks.ReplayAll(); @@ -496,17 +497,18 @@ var viewCommands = mocks.StrictMock(); var nodeData = new object(); - importCommandHandler.Expect(ch => ch.GetSupportedImportInfos(nodeData)) - .Return(hasImportersForNodeData - ? new[] - { - new ImportInfo() - } - : new ImportInfo[0]); + ImportInfo[] importInfos = hasImportersForNodeData + ? new[] + { + new ImportInfo() + } + : new ImportInfo[0]; + importCommandHandler.Expect(ich => ich.GetSupportedImportInfos(nodeData)).Return(importInfos); + if (hasImportersForNodeData) { - importCommandHandler.Expect(ch => ch.ImportOn(nodeData)); + importCommandHandler.Expect(ich => ich.ImportOn(nodeData, importInfos)); } mocks.ReplayAll();