zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

passing logger down to BrowserWindow

Browse source
This commit is contained in:
Jonas Sourlier 2022-05-03 08:59:22 +02:00
parent ef63a67aee
commit 91b15eeb98
5 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SafeExamBrowser.Browser/BrowserWindow.cs
View file

@ -192,7 +192,7 @@ namespace SafeExamBrowser.Browser
internal void InitializeWindow() internal void InitializeWindow()
{ {
window = uiFactory.CreateBrowserWindow(Control, settings, isMainWindow); window = uiFactory.CreateBrowserWindow(Control, settings, isMainWindow, this.logger);
window.AddressChanged += Window_AddressChanged; window.AddressChanged += Window_AddressChanged;
window.BackwardNavigationRequested += Window_BackwardNavigationRequested; window.BackwardNavigationRequested += Window_BackwardNavigationRequested;
window.Closed += Window_Closed; window.Closed += Window_Closed;

2
SafeExamBrowser.UserInterface.Contracts/IUserInterfaceFactory.cs
View file

@ -56,7 +56,7 @@ namespace SafeExamBrowser.UserInterface.Contracts
/// <summary> /// <summary>
/// Creates a new browser window loaded with the given browser control and settings. /// Creates a new browser window loaded with the given browser control and settings.
/// </summary> /// </summary>
IBrowserWindow CreateBrowserWindow(IBrowserControl control, BrowserSettings settings, bool isMainWindow); IBrowserWindow CreateBrowserWindow(IBrowserControl control, BrowserSettings settings, bool isMainWindow, ILogger logger);
/// <summary> /// <summary>
/// Creates an exam selection dialog for the given exams. /// Creates an exam selection dialog for the given exams.

4
SafeExamBrowser.UserInterface.Desktop/UserInterfaceFactory.cs
View file

@ -80,9 +80,9 @@ namespace SafeExamBrowser.UserInterface.Desktop
} }
} }
public IBrowserWindow CreateBrowserWindow(IBrowserControl control, BrowserSettings settings, bool isMainWindow) public IBrowserWindow CreateBrowserWindow(IBrowserControl control, BrowserSettings settings, bool isMainWindow, ILogger logger)
{ {
return Application.Current.Dispatcher.Invoke(() => new BrowserWindow(control, settings, isMainWindow, text)); return Application.Current.Dispatcher.Invoke(() => new BrowserWindow(control, settings, isMainWindow, text, logger));
} }
public IExamSelectionDialog CreateExamSelectionDialog(IEnumerable<Exam> exams) public IExamSelectionDialog CreateExamSelectionDialog(IEnumerable<Exam> exams)

4
SafeExamBrowser.UserInterface.Mobile/UserInterfaceFactory.cs
View file

@ -80,9 +80,9 @@ namespace SafeExamBrowser.UserInterface.Mobile
} }
} }
public IBrowserWindow CreateBrowserWindow(IBrowserControl control, BrowserSettings settings, bool isMainWindow) public IBrowserWindow CreateBrowserWindow(IBrowserControl control, BrowserSettings settings, bool isMainWindow, ILogger logger)
{ {
return Application.Current.Dispatcher.Invoke(() => new BrowserWindow(control, settings, isMainWindow, text)); return Application.Current.Dispatcher.Invoke(() => new BrowserWindow(control, settings, isMainWindow, text, logger));
} }
public IExamSelectionDialog CreateExamSelectionDialog(IEnumerable<Exam> exams) public IExamSelectionDialog CreateExamSelectionDialog(IEnumerable<Exam> exams)

5
SafeExamBrowser.UserInterface.Mobile/Windows/BrowserWindow.xaml.cs
View file

@ -17,6 +17,7 @@ using System.Windows.Media.Imaging;
using SafeExamBrowser.Browser.Contracts.Events; using SafeExamBrowser.Browser.Contracts.Events;
using SafeExamBrowser.Core.Contracts.Resources.Icons; using SafeExamBrowser.Core.Contracts.Resources.Icons;
using SafeExamBrowser.I18n.Contracts; using SafeExamBrowser.I18n.Contracts;
using SafeExamBrowser.Logging.Contracts;
using SafeExamBrowser.Settings.Browser; using SafeExamBrowser.Settings.Browser;
using SafeExamBrowser.UserInterface.Contracts; using SafeExamBrowser.UserInterface.Contracts;
using SafeExamBrowser.UserInterface.Contracts.Browser; using SafeExamBrowser.UserInterface.Contracts.Browser;
@ -37,6 +38,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
private WindowClosedEventHandler closed; private WindowClosedEventHandler closed;
private WindowClosingEventHandler closing; private WindowClosingEventHandler closing;
private ILogger logger;
private WindowSettings WindowSettings private WindowSettings WindowSettings
{ {
@ -71,11 +73,12 @@ namespace SafeExamBrowser.UserInterface.Mobile.Windows
remove { closing -= value; } remove { closing -= value; }
} }
internal BrowserWindow(IBrowserControl browserControl, BrowserSettings settings, bool isMainWindow, IText text) internal BrowserWindow(IBrowserControl browserControl, BrowserSettings settings, bool isMainWindow, IText text, ILogger logger)
{ {
this.isMainWindow = isMainWindow; this.isMainWindow = isMainWindow;
this.settings = settings; this.settings = settings;
this.text = text; this.text = text;
this.logger = logger;
InitializeComponent(); InitializeComponent();
InitializeBrowserWindow(browserControl); InitializeBrowserWindow(browserControl);