Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
@@ -62,6 +62,7 @@
// Start application after this process will exit (used during restart)
private const string argumentWaitForProcess = "--wait-for-process=";
+ private const int numberOfDaysToKeepLogFiles = 30;
private static readonly ILog log = LogManager.GetLogger(typeof(App));
@@ -175,11 +176,10 @@
///
private void DeleteOldLogFiles()
{
- var settingsDirectory = SettingsHelper.GetApplicationLocalUserSettingsDirectory();
- var logFiles = Directory.GetFiles(settingsDirectory, "*.log");
- foreach (var logFile in logFiles)
+ string settingsDirectory = SettingsHelper.GetApplicationLocalUserSettingsDirectory();
+ foreach (string logFile in Directory.GetFiles(settingsDirectory, "*.log"))
{
- if ((DateTime.Now - File.GetCreationTime(logFile)).TotalDays > 30)
+ if ((DateTime.Now - File.GetCreationTime(logFile)).TotalDays > numberOfDaysToKeepLogFiles)
{
File.Delete(logFile);
}
Index: Core/Common/src/Core.Common.Gui/Appenders/RingtoetsUserDataFolderConverter.cs
===================================================================
diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c
--- Core/Common/src/Core.Common.Gui/Appenders/RingtoetsUserDataFolderConverter.cs (.../RingtoetsUserDataFolderConverter.cs) (revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455)
+++ Core/Common/src/Core.Common.Gui/Appenders/RingtoetsUserDataFolderConverter.cs (.../RingtoetsUserDataFolderConverter.cs) (revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
@@ -19,7 +19,6 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using System;
using System.IO;
using Core.Common.Gui.Settings;
@@ -28,9 +27,6 @@
namespace Core.Common.Gui.Appenders
{
- //special folders not in latests stable (1.2.10) version of log4net hence this for DS user dir.
- //Any arguments are ignored and just just return c:\user\muurman\appdata\deltares\ds1.0.0.0\
- //from http://logging.apache.org/log4net/release/release-notes.html
///
/// Converter that injects the application user data folder.
///
Index: Core/Common/src/Core.Common.Gui/Appenders/RunReportLogAppender.cs
===================================================================
diff -u -rfbb37872d09f1ded75ce2209e8e48a6b64d8a78f -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c
--- Core/Common/src/Core.Common.Gui/Appenders/RunReportLogAppender.cs (.../RunReportLogAppender.cs) (revision fbb37872d09f1ded75ce2209e8e48a6b64d8a78f)
+++ Core/Common/src/Core.Common.Gui/Appenders/RunReportLogAppender.cs (.../RunReportLogAppender.cs) (revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
@@ -60,7 +60,6 @@
{
if (value != null && appendMessageLineAction != null)
{
- // Setting 2nd action: fail fast!
throw new InvalidOperationException("An action is already set");
}
Index: Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs
===================================================================
diff -u -r791e86bf9004a55178386416eb6a9c545380bd1c -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c
--- Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs (.../StorageCommandHandler.cs) (revision 791e86bf9004a55178386416eb6a9c545380bd1c)
+++ Core/Common/src/Core.Common.Gui/Commands/StorageCommandHandler.cs (.../StorageCommandHandler.cs) (revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
@@ -232,7 +232,7 @@
Filter = string.Format(Resources.Ringtoets_project_file_filter),
FilterIndex = 1,
RestoreDirectory = true,
- FileName = string.Format("{0}", projectName)
+ FileName = projectName
})
{
if (saveFileDialog.ShowDialog() != DialogResult.OK)
Index: Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs
===================================================================
diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c
--- Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs (.../GuiContextMenuItemFactory.cs) (revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455)
+++ Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs (.../GuiContextMenuItemFactory.cs) (revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
@@ -50,8 +50,7 @@
/// The which contains
/// information for creating the .
/// The for which to create .
- /// Thrown when either
- /// or is null.
+ /// Thrown when any input argument is null.
public GuiContextMenuItemFactory(IApplicationFeatureCommands applicationFeatureCommandHandler, IExportImportCommandHandler exportImportCommandHandler, IViewCommands viewCommandsHandler, TreeNode treeNode)
{
if (applicationFeatureCommandHandler == null)
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -rf1e2ad82328ef2ef9a8079b79dc405c0a166188a -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision f1e2ad82328ef2ef9a8079b79dc405c0a166188a)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
@@ -305,7 +305,6 @@
toolViewController.ToolWindowViews.Add(propertyGrid, ViewLocation.Right | ViewLocation.Bottom);
- toolViewController.ToolWindowViews.ActiveView = null;
toolViewController.ToolWindowViews.ActiveView = propertyGrid;
}
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -r9c811f0b982e9e29dc0652dfad928ff08ae75a3d -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 9c811f0b982e9e29dc0652dfad928ff08ae75a3d)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
@@ -41,6 +41,7 @@
using Core.Common.Gui.Forms.MainWindow;
using Core.Common.Gui.Forms.MessageWindow;
using Core.Common.Gui.Forms.PropertyGridView;
+using Core.Common.Gui.Forms.SplashScreen;
using Core.Common.Gui.Forms.ViewManager;
using Core.Common.Gui.Plugin;
using Core.Common.Gui.Properties;
@@ -54,7 +55,6 @@
using log4net.Appender;
using log4net.Repository.Hierarchy;
-using SplashScreen = Core.Common.Gui.Forms.SplashScreen.SplashScreen;
using Application = System.Windows.Application;
using WindowsApplication = System.Windows.Forms.Application;
@@ -586,7 +586,7 @@
DocumentViewsResolver = new ViewResolver(documentViews, Plugins.SelectMany(p => p.GetViewInfoObjects()), mainWindow);
PropertyResolver = new PropertyResolver(Plugins.SelectMany(p => p.GetPropertyInfos()));
- appFeatureApplicationCommands = new ApplicationFeatureCommandHandler(PropertyResolver, MainWindow, this);
+ applicationFeatureCommands = new ApplicationFeatureCommandHandler(PropertyResolver, MainWindow, this);
var allowedToolWindowLocations = new[]
{
@@ -747,7 +747,7 @@
public IContextMenuBuilder Get(TreeNode treeNode, TreeViewControl treeViewControl)
{
- return new ContextMenuBuilder(appFeatureApplicationCommands, exportImportCommandHandler, ViewCommands, treeNode, treeViewControl);
+ return new ContextMenuBuilder(applicationFeatureCommands, exportImportCommandHandler, ViewCommands, treeNode, treeViewControl);
}
#endregion
@@ -849,7 +849,7 @@
#region Implementation: ICommandsOwner
- private ApplicationFeatureCommandHandler appFeatureApplicationCommands;
+ private ApplicationFeatureCommandHandler applicationFeatureCommands;
private readonly ViewCommandHandler viewCommandHandler;
private readonly ProjectCommandsHandler projectCommandsHandler;
private readonly ExportImportCommandHandler exportImportCommandHandler;
@@ -859,7 +859,7 @@
{
get
{
- return appFeatureApplicationCommands;
+ return applicationFeatureCommands;
}
}
Index: Core/Common/src/Core.Common.Gui/ViewPropertyEditor.cs
===================================================================
diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c
--- Core/Common/src/Core.Common.Gui/ViewPropertyEditor.cs (.../ViewPropertyEditor.cs) (revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455)
+++ Core/Common/src/Core.Common.Gui/ViewPropertyEditor.cs (.../ViewPropertyEditor.cs) (revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
@@ -40,13 +40,13 @@
/// Usage (for example):
///
/// [Editor(typeof(ViewPropertyEditor), typeof(UITypeEditor))]
- /// public TimeSeries TimeSeries
+ /// public Foo SomeFooProperty
/// {
- /// get { return data.TimeSeries; }
- /// set { data.TimeSeries = value; } //not called
+ /// get { return data.Foo; }
+ /// set { data.Foo = value; }
/// }
///
- /// This would typically open a FunctionView to edit the time series.
+ /// This would open a view registered for the Foo datatype.
///
public class ViewPropertyEditor : UITypeEditor
{
Index: Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml
===================================================================
diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c
--- Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml (.../ChartingRibbon.xaml) (revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml (.../ChartingRibbon.xaml) (revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
@@ -4,13 +4,12 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:fluent="clr-namespace:Fluent;assembly=Fluent"
- xmlns:gui="clr-namespace:Core.Common.Gui;assembly=Core.Common.Gui"
xmlns:p="clr-namespace:Core.Plugins.OxyPlot.Properties"
xmlns:common="clr-namespace:Core.Common.Gui.Properties;assembly=Core.Common.Gui"
- xmlns:Converters="clr-namespace:Core.Common.Gui.Converters;assembly=Core.Common.Gui"
+ xmlns:converters="clr-namespace:Core.Common.Gui.Converters;assembly=Core.Common.Gui"
mc:Ignorable="d" Width="686.4" Height="168" Background="White">
-
+
@@ -20,21 +19,21 @@
-
+
-
+
-
-
-
+
+
+
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/OpenChartViewCommandTest.cs
===================================================================
diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/OpenChartViewCommandTest.cs (.../OpenChartViewCommandTest.cs) (revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/OpenChartViewCommandTest.cs (.../OpenChartViewCommandTest.cs) (revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
@@ -16,14 +16,14 @@
{
// Setup
var mocks = new MockRepository();
- var guiMock = mocks.StrictMock();
+ var documentViewController = mocks.StrictMock();
var viewResolverMock = mocks.StrictMock();
- guiMock.Expect(g => g.DocumentViewsResolver).Return(viewResolverMock);
+ documentViewController.Expect(g => g.DocumentViewsResolver).Return(viewResolverMock);
viewResolverMock.Expect(vr => vr.OpenViewForData(null)).IgnoreArguments().Return(true);
mocks.ReplayAll();
- var command = new OpenChartViewCommand(guiMock);
+ var command = new OpenChartViewCommand(documentViewController);
// Call
command.Execute();