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

Minor refactoring (renamed UI factory).

Browse source
This commit is contained in:
dbuechel 2017-07-27 14:45:54 +02:00
parent 8c32d3bc4a
commit 9125b41361
13 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SafeExamBrowser.Browser/BrowserApplicationController.cs
View file

@ -21,9 +21,9 @@ namespace SafeExamBrowser.Browser
private ITaskbarButton button; private ITaskbarButton button;
private IList<IApplicationInstance> instances = new List<IApplicationInstance>(); private IList<IApplicationInstance> instances = new List<IApplicationInstance>();
private ISettings settings; private ISettings settings;
private IUiElementFactory uiFactory; private IUserInterfaceFactory uiFactory;
public BrowserApplicationController(ISettings settings, IUiElementFactory uiFactory) public BrowserApplicationController(ISettings settings, IUserInterfaceFactory uiFactory)
{ {
this.settings = settings; this.settings = settings;
this.uiFactory = uiFactory; this.uiFactory = uiFactory;

2
SafeExamBrowser.Contracts/SafeExamBrowser.Contracts.csproj
View file

@ -92,7 +92,7 @@
<Compile Include="I18n\ITextResource.cs" /> <Compile Include="I18n\ITextResource.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UserInterface\ITaskbarButton.cs" /> <Compile Include="UserInterface\ITaskbarButton.cs" />
<Compile Include="UserInterface\IUiElementFactory.cs" /> <Compile Include="UserInterface\IUserInterfaceFactory.cs" />
<Compile Include="UserInterface\IWindow.cs" /> <Compile Include="UserInterface\IWindow.cs" />
<Compile Include="UserInterface\MessageBoxAction.cs" /> <Compile Include="UserInterface\MessageBoxAction.cs" />
<Compile Include="UserInterface\MessageBoxIcon.cs" /> <Compile Include="UserInterface\MessageBoxIcon.cs" />

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

@ -11,7 +11,7 @@ using SafeExamBrowser.Contracts.I18n;
namespace SafeExamBrowser.Contracts.UserInterface namespace SafeExamBrowser.Contracts.UserInterface
{ {
public interface IUiElementFactory : IMessageBox public interface IUserInterfaceFactory : IMessageBox
{ {
/// <summary> /// <summary>
/// Creates a taskbar button, initialized with the given application information. /// Creates a taskbar button, initialized with the given application information.

4
SafeExamBrowser.Core.UnitTests/Behaviour/ShutdownControllerTests.cs
View file

@ -24,7 +24,7 @@ namespace SafeExamBrowser.Core.UnitTests.Behaviour
private Mock<ILogger> loggerMock; private Mock<ILogger> loggerMock;
private Mock<ISettings> settingsMock; private Mock<ISettings> settingsMock;
private Mock<IText> textMock; private Mock<IText> textMock;
private Mock<IUiElementFactory> uiFactoryMock; private Mock<IUserInterfaceFactory> uiFactoryMock;
private IShutdownController sut; private IShutdownController sut;
@ -34,7 +34,7 @@ namespace SafeExamBrowser.Core.UnitTests.Behaviour
loggerMock = new Mock<ILogger>(); loggerMock = new Mock<ILogger>();
settingsMock = new Mock<ISettings>(); settingsMock = new Mock<ISettings>();
textMock = new Mock<IText>(); textMock = new Mock<IText>();
uiFactoryMock = new Mock<IUiElementFactory>(); uiFactoryMock = new Mock<IUserInterfaceFactory>();
uiFactoryMock.Setup(f => f.CreateSplashScreen(settingsMock.Object, textMock.Object)).Returns(new Mock<ISplashScreen>().Object); uiFactoryMock.Setup(f => f.CreateSplashScreen(settingsMock.Object, textMock.Object)).Returns(new Mock<ISplashScreen>().Object);

4
SafeExamBrowser.Core.UnitTests/Behaviour/StartupControllerTests.cs
View file

@ -25,7 +25,7 @@ namespace SafeExamBrowser.Core.UnitTests.Behaviour
private Mock<ILogger> loggerMock; private Mock<ILogger> loggerMock;
private Mock<ISettings> settingsMock; private Mock<ISettings> settingsMock;
private Mock<IText> textMock; private Mock<IText> textMock;
private Mock<IUiElementFactory> uiFactoryMock; private Mock<IUserInterfaceFactory> uiFactoryMock;
private IStartupController sut; private IStartupController sut;
@ -35,7 +35,7 @@ namespace SafeExamBrowser.Core.UnitTests.Behaviour
loggerMock = new Mock<ILogger>(); loggerMock = new Mock<ILogger>();
settingsMock = new Mock<ISettings>(); settingsMock = new Mock<ISettings>();
textMock = new Mock<IText>(); textMock = new Mock<IText>();
uiFactoryMock = new Mock<IUiElementFactory>(); uiFactoryMock = new Mock<IUserInterfaceFactory>();
uiFactoryMock.Setup(f => f.CreateSplashScreen(settingsMock.Object, textMock.Object)).Returns(new Mock<ISplashScreen>().Object); uiFactoryMock.Setup(f => f.CreateSplashScreen(settingsMock.Object, textMock.Object)).Returns(new Mock<ISplashScreen>().Object);

4
SafeExamBrowser.Core/Behaviour/Operations/BrowserOperation.cs
View file

@ -20,7 +20,7 @@ namespace SafeExamBrowser.Core.Behaviour.Operations
private IApplicationInfo browserInfo; private IApplicationInfo browserInfo;
private ILogger logger; private ILogger logger;
private ITaskbar taskbar; private ITaskbar taskbar;
private IUiElementFactory uiFactory; private IUserInterfaceFactory uiFactory;
public ISplashScreen SplashScreen { private get; set; } public ISplashScreen SplashScreen { private get; set; }
@ -29,7 +29,7 @@ namespace SafeExamBrowser.Core.Behaviour.Operations
IApplicationInfo browserInfo, IApplicationInfo browserInfo,
ILogger logger, ILogger logger,
ITaskbar taskbar, ITaskbar taskbar,
IUiElementFactory uiFactory) IUserInterfaceFactory uiFactory)
{ {
this.browserController = browserController; this.browserController = browserController;
this.browserInfo = browserInfo; this.browserInfo = browserInfo;

4
SafeExamBrowser.Core/Behaviour/Operations/TaskbarOperation.cs
View file

@ -18,12 +18,12 @@ namespace SafeExamBrowser.Core.Behaviour.Operations
{ {
private ILogger logger; private ILogger logger;
private ITaskbar taskbar; private ITaskbar taskbar;
private IUiElementFactory uiFactory; private IUserInterfaceFactory uiFactory;
private INotificationInfo aboutInfo; private INotificationInfo aboutInfo;
public ISplashScreen SplashScreen { private get; set; } public ISplashScreen SplashScreen { private get; set; }
public TaskbarOperation(ILogger logger, INotificationInfo aboutInfo, ITaskbar taskbar, IUiElementFactory uiFactory) public TaskbarOperation(ILogger logger, INotificationInfo aboutInfo, ITaskbar taskbar, IUserInterfaceFactory uiFactory)
{ {
this.logger = logger; this.logger = logger;
this.aboutInfo = aboutInfo; this.aboutInfo = aboutInfo;

4
SafeExamBrowser.Core/Behaviour/ShutdownController.cs
View file

@ -23,9 +23,9 @@ namespace SafeExamBrowser.Core.Behaviour
private ISettings settings; private ISettings settings;
private ISplashScreen splashScreen; private ISplashScreen splashScreen;
private IText text; private IText text;
private IUiElementFactory uiFactory; private IUserInterfaceFactory uiFactory;
public ShutdownController(ILogger logger, ISettings settings, IText text, IUiElementFactory uiFactory) public ShutdownController(ILogger logger, ISettings settings, IText text, IUserInterfaceFactory uiFactory)
{ {
this.logger = logger; this.logger = logger;
this.settings = settings; this.settings = settings;

4
SafeExamBrowser.Core/Behaviour/StartupController.cs
View file

@ -24,11 +24,11 @@ namespace SafeExamBrowser.Core.Behaviour
private ISettings settings; private ISettings settings;
private ISplashScreen splashScreen; private ISplashScreen splashScreen;
private IText text; private IText text;
private IUiElementFactory uiFactory; private IUserInterfaceFactory uiFactory;
private Stack<IOperation> stack = new Stack<IOperation>(); private Stack<IOperation> stack = new Stack<IOperation>();
public StartupController(ILogger logger, ISettings settings, IText text, IUiElementFactory uiFactory) public StartupController(ILogger logger, ISettings settings, IText text, IUserInterfaceFactory uiFactory)
{ {
this.logger = logger; this.logger = logger;
this.settings = settings; this.settings = settings;

2
SafeExamBrowser.UserInterface/SafeExamBrowser.UserInterface.csproj
View file

@ -104,7 +104,7 @@
<Compile Include="Taskbar.xaml.cs"> <Compile Include="Taskbar.xaml.cs">
<DependentUpon>Taskbar.xaml</DependentUpon> <DependentUpon>Taskbar.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="UiElementFactory.cs" /> <Compile Include="UserInterfaceFactory.cs" />
<Compile Include="Utilities\IconResourceLoader.cs" /> <Compile Include="Utilities\IconResourceLoader.cs" />
<Compile Include="ViewModels\DateTimeViewModel.cs" /> <Compile Include="ViewModels\DateTimeViewModel.cs" />
<Compile Include="ViewModels\SplashScreenViewModel.cs" /> <Compile Include="ViewModels\SplashScreenViewModel.cs" />

2
SafeExamBrowser.UserInterface/UiElementFactory.cs → SafeExamBrowser.UserInterface/UserInterfaceFactory.cs
View file

@ -15,7 +15,7 @@ using SafeExamBrowser.UserInterface.Controls;
namespace SafeExamBrowser.UserInterface namespace SafeExamBrowser.UserInterface
{ {
public class UiElementFactory : IUiElementFactory public class UserInterfaceFactory : IUserInterfaceFactory
{ {
public ITaskbarButton CreateApplicationButton(IApplicationInfo info) public ITaskbarButton CreateApplicationButton(IApplicationInfo info)
{ {

8
SafeExamBrowser.WindowsApi/NativeMethods.cs
View file

@ -128,8 +128,8 @@ namespace SafeExamBrowser.WindowsApi
var handle = User32.SetWinEventHook(Constant.EVENT_SYSTEM_FOREGROUND, Constant.EVENT_SYSTEM_FOREGROUND, IntPtr.Zero, eventProc, 0, 0, Constant.WINEVENT_OUTOFCONTEXT); var handle = User32.SetWinEventHook(Constant.EVENT_SYSTEM_FOREGROUND, Constant.EVENT_SYSTEM_FOREGROUND, IntPtr.Zero, eventProc, 0, 0, Constant.WINEVENT_OUTOFCONTEXT);
// IMORTANT: // IMORTANT:
// Ensures that the callback does not get garbage collected prematurely, as it will be passed to unmanaged code! // Ensures that the callback does not get garbage collected prematurely, as it will be passed to unmanaged code.
// Not doing so will result in a <c>CallbackOnCollectedDelegate</c> error and subsequent application crash. // Not doing so will result in a <c>CallbackOnCollectedDelegate</c> error and subsequent application crash!
EventDelegates[handle] = eventProc; EventDelegates[handle] = eventProc;
return handle; return handle;
@ -145,8 +145,8 @@ namespace SafeExamBrowser.WindowsApi
var handle = User32.SetWinEventHook(Constant.EVENT_SYSTEM_CAPTURESTART, Constant.EVENT_SYSTEM_CAPTURESTART, IntPtr.Zero, eventProc, 0, 0, Constant.WINEVENT_OUTOFCONTEXT); var handle = User32.SetWinEventHook(Constant.EVENT_SYSTEM_CAPTURESTART, Constant.EVENT_SYSTEM_CAPTURESTART, IntPtr.Zero, eventProc, 0, 0, Constant.WINEVENT_OUTOFCONTEXT);
// IMORTANT: // IMORTANT:
// Ensures that the callback does not get garbage collected prematurely, as it will be passed to unmanaged code! // Ensures that the callback does not get garbage collected prematurely, as it will be passed to unmanaged code.
// Not doing so will result in a <c>CallbackOnCollectedDelegate</c> error and subsequent application crash. // Not doing so will result in a <c>CallbackOnCollectedDelegate</c> error and subsequent application crash!
EventDelegates[handle] = eventProc; EventDelegates[handle] = eventProc;
return handle; return handle;

4
SafeExamBrowser/CompositionRoot.cs
View file

@ -39,7 +39,7 @@ namespace SafeExamBrowser
private ISettings settings; private ISettings settings;
private IText text; private IText text;
private ITextResource textResource; private ITextResource textResource;
private IUiElementFactory uiFactory; private IUserInterfaceFactory uiFactory;
private IWindowMonitor windowMonitor; private IWindowMonitor windowMonitor;
private IWorkingArea workingArea; private IWorkingArea workingArea;
@ -56,7 +56,7 @@ namespace SafeExamBrowser
settings = new Settings(); settings = new Settings();
Taskbar = new Taskbar(); Taskbar = new Taskbar();
textResource = new XmlTextResource(); textResource = new XmlTextResource();
uiFactory = new UiElementFactory(); uiFactory = new UserInterfaceFactory();
logger.Subscribe(new LogFileWriter(settings)); logger.Subscribe(new LogFileWriter(settings));