Skip to content

Commit 62ca7e7

Browse files
committed
removed post-merge trash
1 parent 3faf03a commit 62ca7e7

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

RetailCoder.VBE/App.cs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
using Rubberduck.UI;
1212
using Rubberduck.UI.Command.MenuItems;
1313
using Rubberduck.UI.ParserErrors;
14+
using Rubberduck.VBEditor;
15+
using MessageBox = System.Windows.MessageBox;
1416

1517
namespace Rubberduck
1618
{
@@ -23,16 +25,9 @@ public class App : IDisposable
2325
private readonly IGeneralConfigService _configService;
2426
private readonly IAppMenu _appMenus;
2527

26-
private readonly VBE _vbe;
27-
private readonly AddIn _addIn;
28-
private Inspector _inspector;
29-
private ParserErrorsPresenter _parserErrorsPresenter;
30-
private readonly IGeneralConfigService _configService = new ConfigurationLoader();
31-
private readonly ActiveCodePaneEditor _editor;
32-
private readonly IRubberduckCodePaneFactory _factory;
28+
private IParserErrorsPresenter _parserErrorsPresenter;
3329
private readonly Logger _logger;
3430
private IRubberduckParser _parser;
35-
private IParserErrorsPresenter _parserErrorsPresenter;
3631

3732
private Configuration _config;
3833

@@ -49,9 +44,6 @@ public App(IMessageBox messageBox,
4944
_inspectorFactory = inspectorFactory;
5045
_configService = configService;
5146
_appMenus = appMenus;
52-
_vbe = vbe;
53-
_addIn = addIn;
54-
_factory = new RubberduckCodePaneFactory();
5547
_logger = LogManager.GetCurrentClassLogger();
5648

5749
_configService.SettingsChanged += _configService_SettingsChanged;
@@ -91,7 +83,7 @@ private void LoadConfig()
9183
catch (CultureNotFoundException exception)
9284
{
9385
_logger.Error(exception, "Error Setting Culture for RubberDuck");
94-
MessageBox.Show(exception.Message, "Rubberduck", MessageBoxButtons.OK, MessageBoxIcon.Error);
86+
_messageBox.Show(exception.Message, "Rubberduck", MessageBoxButtons.OK, MessageBoxIcon.Error);
9587
_config.UserSettings.LanguageSetting.Code = currentCulture.Name;
9688
_configService.SaveConfiguration(_config);
9789
}

0 commit comments

Comments
 (0)