Index: Application/Ringtoets/test/Application.Ringtoets.Integration.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -r36c21a3d0c70c12e05f2b2ffff8e2b974d604912 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Application/Ringtoets/test/Application.Ringtoets.Integration.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 36c21a3d0c70c12e05f2b2ffff8e2b974d604912) +++ Application/Ringtoets/test/Application.Ringtoets.Integration.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Application.Ringtoets.Integration.Test")] [assembly: AssemblyProduct("Application.Ringtoets.Integration.Test")] -[assembly: Guid("537de107-6ec4-4ecc-9238-0ed060c7a97b")] +[assembly: Guid("537de107-6ec4-4ecc-9238-0ed060c7a97b")] \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Integration.Test/ResourcesTest.cs =================================================================== diff -u -rbac72f2954b42c15dcd76654023fe0654f2088d7 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Application/Ringtoets/test/Application.Ringtoets.Integration.Test/ResourcesTest.cs (.../ResourcesTest.cs) (revision bac72f2954b42c15dcd76654023fe0654f2088d7) +++ Application/Ringtoets/test/Application.Ringtoets.Integration.Test/ResourcesTest.cs (.../ResourcesTest.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -52,8 +52,7 @@ string sourceCode = "*.cs;*.xaml"; string filters = "Resources.designer.cs;test"; string searchPatterns = Regex.Replace("\\[.*\\(typeof\\(.*Resources\\).*\"-f-\".*\\)\\];\"-f-\"\\);Resources.-f-;Resources\\\\-f-", @"(\\*)" + "\"", @"$1$1\" + "\""); - - + string directory = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "UnusedResourceSearcher"); string executable = Path.Combine(directory, "UnusedResourceSearcher.exe"); Index: Core/Common/src/Core.Common.Base/Data/RoundedDouble.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/Data/RoundedDouble.cs (.../RoundedDouble.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Core/Common/src/Core.Common.Base/Data/RoundedDouble.cs (.../RoundedDouble.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -22,7 +22,6 @@ using System; using System.ComponentModel; using System.Globalization; - using Core.Common.Base.Properties; using Core.Common.Base.TypeConverters; @@ -108,18 +107,18 @@ public static RoundedDouble operator *(RoundedDouble left, double right) { - return new RoundedDouble(left.numberOfDecimalPlaces, left.value * right); + return new RoundedDouble(left.numberOfDecimalPlaces, left.value*right); } public static RoundedDouble operator *(double left, RoundedDouble right) { - return new RoundedDouble(right.numberOfDecimalPlaces, left * right.value); + return new RoundedDouble(right.numberOfDecimalPlaces, left*right.value); } public static RoundedDouble operator *(RoundedDouble left, RoundedDouble right) { int smallestNumberOfDecimalPlaces = Math.Min(left.numberOfDecimalPlaces, right.numberOfDecimalPlaces); - return new RoundedDouble(smallestNumberOfDecimalPlaces, left.value * right.value); + return new RoundedDouble(smallestNumberOfDecimalPlaces, left.value*right.value); } public static implicit operator double(RoundedDouble d) @@ -157,28 +156,14 @@ { return false; } - return Equals((RoundedDouble)obj); + return Equals((RoundedDouble) obj); } public override int GetHashCode() { return Value.GetHashCode(); } - public string ToString(string format, IFormatProvider formatProvider) - { - if (double.IsPositiveInfinity(value)) - { - return Resources.RoundedDouble_ToString_PositiveInfinity; - } - if (double.IsNegativeInfinity(value)) - { - return Resources.RoundedDouble_ToString_NegativeInfinity; - } - - return Value.ToString(format ?? GetFormat(), formatProvider ?? CultureInfo.CurrentCulture); - } - public override string ToString() { return ToString(null, null); @@ -194,6 +179,20 @@ return Value.Equals(other.Value); } + public string ToString(string format, IFormatProvider formatProvider) + { + if (double.IsPositiveInfinity(value)) + { + return Resources.RoundedDouble_ToString_PositiveInfinity; + } + if (double.IsNegativeInfinity(value)) + { + return Resources.RoundedDouble_ToString_NegativeInfinity; + } + + return Value.ToString(format ?? GetFormat(), formatProvider ?? CultureInfo.CurrentCulture); + } + private static double RoundDouble(double value, int numberOfDecimalPlaces) { return IsSpecialDoubleValue(value) ? Index: Core/Common/src/Core.Common.Base/Geometry/Math2D.cs =================================================================== diff -u -rb486be2a4b038d55e01a318045a56f88d289fa41 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision b486be2a4b038d55e01a318045a56f88d289fa41) +++ Core/Common/src/Core.Common.Base/Geometry/Math2D.cs (.../Math2D.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -315,7 +315,7 @@ throw new ArgumentNullException("lineSegment"); } - if (double.IsNaN(fraction)|| fraction < 0.0 || fraction > 1.0) + if (double.IsNaN(fraction) || fraction < 0.0 || fraction > 1.0) { throw new ArgumentOutOfRangeException("fraction", "Fraction needs to be defined in range [0.0, 1.0] in order to reliably interpolate."); } Index: Core/Common/src/Core.Common.Base/Geometry/Point3D.cs =================================================================== diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/Geometry/Point3D.cs (.../Point3D.cs) (revision 7f759fbabca9c41e75d229269f1b21581b373b5f) +++ Core/Common/src/Core.Common.Base/Geometry/Point3D.cs (.../Point3D.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -68,16 +68,16 @@ { return false; } - return Equals((Point3D)obj); + return Equals((Point3D) obj); } public override int GetHashCode() { unchecked { var hashCode = X.GetHashCode(); - hashCode = (hashCode * 397) ^ Y.GetHashCode(); - hashCode = (hashCode * 397) ^ Z.GetHashCode(); + hashCode = (hashCode*397) ^ Y.GetHashCode(); + hashCode = (hashCode*397) ^ Z.GetHashCode(); return hashCode; } } Index: Core/Common/src/Core.Common.Base/Geometry/Point3DExtensions.cs =================================================================== diff -u -r848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/Geometry/Point3DExtensions.cs (.../Point3DExtensions.cs) (revision 848c3a050bda5fb0dd74232deb7f1d5eba8ecbf6) +++ Core/Common/src/Core.Common.Base/Geometry/Point3DExtensions.cs (.../Point3DExtensions.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -73,8 +73,8 @@ } // Project vector onto the 'spanning vector' to determine its X-coordinate in local coordinates: - double projectOnSpanningVectorFactor = vectorToPoint.DotProduct(spanningVector) / spanningVectorDotProduct; - double localCoordinateX = projectOnSpanningVectorFactor * length; + double projectOnSpanningVectorFactor = vectorToPoint.DotProduct(spanningVector)/spanningVectorDotProduct; + double localCoordinateX = projectOnSpanningVectorFactor*length; return new Point2D(localCoordinateX, worldCoordinate.Z); } Index: Core/Common/src/Core.Common.Base/Geometry/Segment2D.cs =================================================================== diff -u -r57634f535a347ce49c2491f114d7238d5387c7a8 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/Geometry/Segment2D.cs (.../Segment2D.cs) (revision 57634f535a347ce49c2491f114d7238d5387c7a8) +++ Core/Common/src/Core.Common.Base/Geometry/Segment2D.cs (.../Segment2D.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -20,9 +20,7 @@ // All rights reserved. using System; - using Core.Common.Base.Properties; - using MathNet.Numerics.LinearAlgebra; namespace Core.Common.Base.Geometry @@ -135,9 +133,9 @@ // 'point' falls within the perpendicular area defined by the segment (zone B). // 3. Use remainder of vector projection to determine point on segment for perpendicular line: - double projectionFactor = dotProductOrientationVector / dotProductSegmentVector; - double perpendicularOnSegmentX = FirstPoint.X + projectionFactor * segmentVector[0]; - double perpendicularOnSegmentY = FirstPoint.Y + projectionFactor * segmentVector[1]; + double projectionFactor = dotProductOrientationVector/dotProductSegmentVector; + double perpendicularOnSegmentX = FirstPoint.X + projectionFactor*segmentVector[0]; + double perpendicularOnSegmentY = FirstPoint.Y + projectionFactor*segmentVector[1]; var perpendicularLineIntersectionPoint = new Point2D(perpendicularOnSegmentX, perpendicularOnSegmentY); return point.GetEuclideanDistanceTo(perpendicularLineIntersectionPoint); @@ -172,14 +170,14 @@ { return false; } - return Equals((Segment2D)obj); + return Equals((Segment2D) obj); } public override int GetHashCode() { unchecked { - return ((FirstPoint.X + SecondPoint.X).GetHashCode() * 397) ^ (FirstPoint.Y + SecondPoint.Y).GetHashCode(); + return ((FirstPoint.X + SecondPoint.X).GetHashCode()*397) ^ (FirstPoint.Y + SecondPoint.Y).GetHashCode(); } } Index: Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs =================================================================== diff -u -re2719484be4a10aecf59be5a999943bb01688ec0 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision e2719484be4a10aecf59be5a999943bb01688ec0) +++ Core/Common/src/Core.Common.Base/IO/FileImporterBase.cs (.../FileImporterBase.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -22,7 +22,6 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; - using Core.Common.Utils.Reflection; namespace Core.Common.Base.IO @@ -36,13 +35,6 @@ /// public abstract class FileImporterBase : IFileImporter { - /// - /// Gets or sets value indicating if a cancel request has been made. When true, no - /// changes should be made to the data model unless the importer is already in progress - /// of changing the data model. - /// - protected bool Canceled { get; set; } - public abstract string Name { get; } public abstract string Category { get; } public abstract Bitmap Image { get; } @@ -81,6 +73,13 @@ } /// + /// Gets or sets value indicating if a cancel request has been made. When true, no + /// changes should be made to the data model unless the importer is already in progress + /// of changing the data model. + /// + protected bool Canceled { get; set; } + + /// /// Gets all objects that have been affected during the call /// that implement and which are were not the targeted object /// to import the data to. Index: Core/Common/src/Core.Common.Base/Observer.cs =================================================================== diff -u -r07b0e83704b56684d617cd6e8b8570417654912a -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/Observer.cs (.../Observer.cs) (revision 07b0e83704b56684d617cd6e8b8570417654912a) +++ Core/Common/src/Core.Common.Base/Observer.cs (.../Observer.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -68,14 +68,14 @@ } } - public void UpdateObserver() + public void Dispose() { - updateObserverAction(); + Observable = null; } - public void Dispose() + public void UpdateObserver() { - Observable = null; + updateObserverAction(); } } } \ No newline at end of file Index: Core/Common/src/Core.Common.Base/RecursiveObserver.cs =================================================================== diff -u -rf65694c90375dbbed8fea4db8e7d0873cc659669 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/RecursiveObserver.cs (.../RecursiveObserver.cs) (revision f65694c90375dbbed8fea4db8e7d0873cc659669) +++ Core/Common/src/Core.Common.Base/RecursiveObserver.cs (.../RecursiveObserver.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -36,12 +36,12 @@ where TContainer : class, IObservable where TObservable : class, IObservable { - private TContainer rootContainer; private readonly Action updateObserverAction; private readonly Func> getChildren; private readonly IList observedContainers = new List(); private readonly IList observedChildren = new List(); private readonly Observer containerObserver; + private TContainer rootContainer; /// /// Creates a new instance of the class. @@ -136,4 +136,4 @@ } } } -} +} \ No newline at end of file Index: Core/Common/src/Core.Common.Base/Storage/CouldNotConnectException.cs =================================================================== diff -u -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/Storage/CouldNotConnectException.cs (.../CouldNotConnectException.cs) (revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5) +++ Core/Common/src/Core.Common.Base/Storage/CouldNotConnectException.cs (.../CouldNotConnectException.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -49,6 +49,6 @@ /// The error message that explains the reason for the exception. /// The exception that is the cause of the current exception, /// or a null reference if no inner exception is specified. - public CouldNotConnectException(string message, Exception inner) : base(message, inner) { } + public CouldNotConnectException(string message, Exception inner) : base(message, inner) {} } } \ No newline at end of file Index: Core/Common/src/Core.Common.Base/Storage/IStorable.cs =================================================================== diff -u -rfff12e249602fb700b2854c14a3b7cdd0b73c023 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/Storage/IStorable.cs (.../IStorable.cs) (revision fff12e249602fb700b2854c14a3b7cdd0b73c023) +++ Core/Common/src/Core.Common.Base/Storage/IStorable.cs (.../IStorable.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -31,4 +31,4 @@ /// long StorageId { get; set; } } -} +} \ No newline at end of file Index: Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs =================================================================== diff -u -r71d4e63c89a10c9d0ea8aa2535cde0bc973d9991 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs (.../IStoreProject.cs) (revision 71d4e63c89a10c9d0ea8aa2535cde0bc973d9991) +++ Core/Common/src/Core.Common.Base/Storage/IStoreProject.cs (.../IStoreProject.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -35,6 +35,12 @@ string FileFilter { get; } /// + /// Gets a value indicating whether this instance has staged project. + /// + /// + bool HasStagedProject { get; } + + /// /// Converts the staged project to a new storage entry. /// /// Arguments required to connect to the storage. @@ -75,12 +81,6 @@ void CloseProject(); /// - /// Gets a value indicating whether this instance has staged project. - /// - /// - bool HasStagedProject { get; } - - /// /// Stages the project (does some prep-work and validity checking) to be saved. /// /// The project to be prepared to be saved. Index: Core/Common/src/Core.Common.Base/Storage/StorageValidationException.cs =================================================================== diff -u -re052252f6f2523cfb33413867a939834ef763ce5 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/Storage/StorageValidationException.cs (.../StorageValidationException.cs) (revision e052252f6f2523cfb33413867a939834ef763ce5) +++ Core/Common/src/Core.Common.Base/Storage/StorageValidationException.cs (.../StorageValidationException.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -49,6 +49,6 @@ /// The error message that explains the reason for the exception. /// The exception that is the cause of the current exception, /// or a null reference if no inner exception is specified. - public StorageValidationException(string message, Exception inner) : base(message, inner) { } + public StorageValidationException(string message, Exception inner) : base(message, inner) {} } } \ No newline at end of file Index: Core/Common/src/Core.Common.Base/TypeConverters/RoundedDoubleConverter.cs =================================================================== diff -u -r1119ad16afc56bb523cac630e15fb98b1fcf8d25 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Base/TypeConverters/RoundedDoubleConverter.cs (.../RoundedDoubleConverter.cs) (revision 1119ad16afc56bb523cac630e15fb98b1fcf8d25) +++ Core/Common/src/Core.Common.Base/TypeConverters/RoundedDoubleConverter.cs (.../RoundedDoubleConverter.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -22,14 +22,13 @@ using System; using System.ComponentModel; using System.Globalization; - using Core.Common.Base.Data; using Core.Common.Base.Properties; namespace Core.Common.Base.TypeConverters { /// - /// Class that converts representations of a number to a corresponding + /// Class that converts representations of a number to a corresponding /// instance of . /// public class RoundedDoubleConverter : TypeConverter @@ -50,16 +49,16 @@ { try { - return (RoundedDouble)Convert.ToDouble(text); + return (RoundedDouble) Convert.ToDouble(text); } catch (FormatException exception) { if (string.IsNullOrWhiteSpace(text)) { throw new NotSupportedException(Resources.RoundedDoubleConverter_ConvertFrom_String_cannot_be_empty, - exception); + exception); } - + throw new NotSupportedException(Resources.RoundedDoubleConverter_ConvertFrom_String_must_represent_number, exception); } Index: Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs =================================================================== diff -u -rc228254c72f67153ebe8c369d9bd4a3c1a262b4b -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs (.../DragDropHandler.cs) (revision c228254c72f67153ebe8c369d9bd4a3c1a262b4b) +++ Core/Common/src/Core.Common.Controls.TreeView/DragDropHandler.cs (.../DragDropHandler.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -109,7 +109,7 @@ TreeNode nodeOver = treeView.GetNodeAt(point); TreeNode draggedNode = GetDraggedNodeData(e); - if (draggedNode == null || nodeOver == null || nodeOver == draggedNode || IsDropTargetChildOfDraggedNode(nodeOver, draggedNode)) + if (draggedNode == null || nodeOver == null || nodeOver == draggedNode || IsDropTargetChildOfDraggedNode(nodeOver, draggedNode)) { RemovePlaceHolder(treeView); e.Effect = DragDropEffects.None; @@ -150,18 +150,6 @@ } } - private static TreeNode GetDraggedNodeData(DragEventArgs e) - { - try - { - return (TreeNode) e.Data.GetData(typeof(TreeNode)); - } - catch (InvalidCastException) - { - return null; - } - } - /// /// This method handles the event for a . /// @@ -196,6 +184,18 @@ RemovePlaceHolder(treeView); } + private static TreeNode GetDraggedNodeData(DragEventArgs e) + { + try + { + return (TreeNode) e.Data.GetData(typeof(TreeNode)); + } + catch (InvalidCastException) + { + return null; + } + } + private void SetDropAtLocation(DragEventArgs e, TreeNode draggedNode, TreeNode nodeOver) { // Handle dragged items which were originally higher up in the tree under the same parent (all indices shift by one) Index: Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewComboBoxItemWrapper.cs =================================================================== diff -u -r112a4274ab494057ed0a24f5f9c2e1ec3ce3cea8 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewComboBoxItemWrapper.cs (.../DataGridViewComboBoxItemWrapper.cs) (revision 112a4274ab494057ed0a24f5f9c2e1ec3ce3cea8) +++ Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewComboBoxItemWrapper.cs (.../DataGridViewComboBoxItemWrapper.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -75,11 +75,6 @@ } } - private bool Equals(DataGridViewComboBoxItemWrapper other) - { - return EqualityComparer.Default.Equals(wrappedObject, other.wrappedObject); - } - public override bool Equals(object obj) { if (ReferenceEquals(null, obj)) @@ -94,7 +89,7 @@ { return false; } - return Equals((DataGridViewComboBoxItemWrapper)obj); + return Equals((DataGridViewComboBoxItemWrapper) obj); } public override int GetHashCode() @@ -106,5 +101,10 @@ { return DisplayName; } + + private bool Equals(DataGridViewComboBoxItemWrapper other) + { + return EqualityComparer.Default.Equals(wrappedObject, other.wrappedObject); + } } -} +} \ No newline at end of file Index: Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs =================================================================== diff -u -ra411c62ff26b831c05472ad3a45e7ec753071b6f -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs (.../DataGridViewControl.cs) (revision a411c62ff26b831c05472ad3a45e7ec753071b6f) +++ Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs (.../DataGridViewControl.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -92,6 +92,29 @@ } /// + /// Gets a with all the rows of the . + /// + public DataGridViewRowCollection Rows + { + get + { + return dataGridView.Rows; + } + } + + /// + /// Gets the that represents the row containing the current cell, + /// or null if there is no current cell. + /// + public DataGridViewRow CurrentRow + { + get + { + return dataGridView.CurrentRow; + } + } + + /// /// Adds a new to the with the given data. /// /// The of the column. @@ -229,17 +252,6 @@ } /// - /// Gets a with all the rows of the . - /// - public DataGridViewRowCollection Rows - { - get - { - return dataGridView.Rows; - } - } - - /// /// Gets the on the given index. /// /// The index of the row. @@ -251,18 +263,6 @@ } /// - /// Gets the that represents the row containing the current cell, - /// or null if there is no current cell. - /// - public DataGridViewRow CurrentRow - { - get - { - return dataGridView.CurrentRow; - } - } - - /// /// Gets the on the given row and column index. /// /// The index of the row the cell is on. Index: Core/Common/src/Core.Common.Controls/DataGrid/DoubleBufferedDataGridView.cs =================================================================== diff -u -r03a91e1d4a5b97092a09071da67cb5929ef9993e -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Controls/DataGrid/DoubleBufferedDataGridView.cs (.../DoubleBufferedDataGridView.cs) (revision 03a91e1d4a5b97092a09071da67cb5929ef9993e) +++ Core/Common/src/Core.Common.Controls/DataGrid/DoubleBufferedDataGridView.cs (.../DoubleBufferedDataGridView.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -39,4 +39,4 @@ DoubleBuffered = true; } } -} +} \ No newline at end of file Index: Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.cs =================================================================== diff -u -r421210a343c0e63c0bee040c1881b6f9b2663ea6 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.cs (.../DialogBase.cs) (revision 421210a343c0e63c0bee040c1881b6f9b2663ea6) +++ Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.cs (.../DialogBase.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -72,9 +72,7 @@ /// Thrown when or is null. /// Thrown when or is not greater than 0. protected DialogBase(IWin32Window dialogParent, Bitmap icon, int minWidth, int minHeight) : - this(dialogParent, BitmapToIcon(icon), minWidth, minHeight) - { - } + this(dialogParent, BitmapToIcon(icon), minWidth, minHeight) {} /// /// Constructs a new . @@ -116,11 +114,6 @@ Icon = icon; } - private static Icon BitmapToIcon(Bitmap icon) - { - return (icon == null) ? null : Icon.FromHandle(icon.GetHicon()); - } - /// /// This method provides a new implementation of . /// In this new implementation the dialog is shown by passing the owner provided during creation time (see ). @@ -148,5 +141,10 @@ /// The cancel button. /// By forcing derivatives to provide a cancel button, dialogs can be closed by hitting the ESC key on the keyboard. protected abstract Button GetCancelButton(); + + private static Icon BitmapToIcon(Bitmap icon) + { + return (icon == null) ? null : Icon.FromHandle(icon.GetHicon()); + } } } \ No newline at end of file Index: Core/Common/src/Core.Common.Controls/Forms/DoubleBufferedTreeView.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Controls/Forms/DoubleBufferedTreeView.cs (.../DoubleBufferedTreeView.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Common/src/Core.Common.Controls/Forms/DoubleBufferedTreeView.cs (.../DoubleBufferedTreeView.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -54,21 +54,6 @@ } } - private void UpdateExtendedStyles() - { - var style = 0; - - if (DoubleBuffered) - { - style |= tvsExDoublebuffer; - } - - if (style != 0) - { - NativeInterop.SendMessage(Handle, tvmSetextendedstyle, (IntPtr) tvsExDoublebuffer, (IntPtr) style); - } - } - protected override void OnHandleCreated(EventArgs e) { base.OnHandleCreated(e); @@ -101,6 +86,21 @@ base.OnPaint(e); } + private void UpdateExtendedStyles() + { + var style = 0; + + if (DoubleBuffered) + { + style |= tvsExDoublebuffer; + } + + if (style != 0) + { + NativeInterop.SendMessage(Handle, tvmSetextendedstyle, (IntPtr) tvsExDoublebuffer, (IntPtr) style); + } + } + private static class NativeInterop { public const int WmPrintclient = 0x0318; Index: Core/Common/src/Core.Common.Controls/TextEditor/RichTextBoxControl.cs =================================================================== diff -u -r417a73b409ff3fbf1a9dd69cdd3e882fb25e007f -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Controls/TextEditor/RichTextBoxControl.cs (.../RichTextBoxControl.cs) (revision 417a73b409ff3fbf1a9dd69cdd3e882fb25e007f) +++ Core/Common/src/Core.Common.Controls/TextEditor/RichTextBoxControl.cs (.../RichTextBoxControl.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -30,14 +30,14 @@ /// public partial class RichTextBoxControl : UserControl { - private bool loaded; - private string rtfToSetAfterLoad; - /// /// The event which is send when the text changes. /// public event EventHandler TextBoxValueChanged; + private bool loaded; + private string rtfToSetAfterLoad; + /// /// Creates a new instance of . /// @@ -52,19 +52,6 @@ } /// - /// This is needed for the RichTextBox to apply styling. - /// - private void OnLoad(object sender, EventArgs eventArgs) - { - loaded = true; - - if (!string.IsNullOrEmpty(rtfToSetAfterLoad)) - { - richTextBox.Rtf = rtfToSetAfterLoad; - } - } - - /// /// Gets or sets the Rtf from the . /// public string Rtf @@ -86,6 +73,19 @@ } } + /// + /// This is needed for the RichTextBox to apply styling. + /// + private void OnLoad(object sender, EventArgs eventArgs) + { + loaded = true; + + if (!string.IsNullOrEmpty(rtfToSetAfterLoad)) + { + richTextBox.Rtf = rtfToSetAfterLoad; + } + } + #region Event handling private void OnTextChanged(object sender, EventArgs e) @@ -105,7 +105,8 @@ { if (e.Modifiers == Keys.Control) { - switch (e.KeyCode) { + switch (e.KeyCode) + { case Keys.B: e.Handled = true; SetStyle(FontStyle.Bold); Index: Core/Common/src/Core.Common.Controls/Views/ISelectionProvider.cs =================================================================== diff -u -rba9236580e1e4361d4c5392c238f8b9930aaa90e -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Controls/Views/ISelectionProvider.cs (.../ISelectionProvider.cs) (revision ba9236580e1e4361d4c5392c238f8b9930aaa90e) +++ Core/Common/src/Core.Common.Controls/Views/ISelectionProvider.cs (.../ISelectionProvider.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -29,6 +29,6 @@ /// /// Gets the selected ; or null if nothing is selected. /// - object Selection { get; } + object Selection { get; } } } \ No newline at end of file Index: Core/Common/src/Core.Common.Geometry/InvalidPolygonException.cs =================================================================== diff -u -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Geometry/InvalidPolygonException.cs (.../InvalidPolygonException.cs) (revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5) +++ Core/Common/src/Core.Common.Geometry/InvalidPolygonException.cs (.../InvalidPolygonException.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -49,6 +49,6 @@ /// The error message that explains the reason for the exception. /// The exception that is the cause of the current exception, /// or a null reference if no inner exception is specified. - public InvalidPolygonException(string message, Exception inner) : base(message, inner) { } + public InvalidPolygonException(string message, Exception inner) : base(message, inner) {} } } \ No newline at end of file Index: Core/Common/src/Core.Common.Geometry/Properties/AssemblyInfo.cs =================================================================== diff -u -r725bf2a9045d013dde7ff78d088bd433790ded88 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Geometry/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 725bf2a9045d013dde7ff78d088bd433790ded88) +++ Core/Common/src/Core.Common.Geometry/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -24,5 +24,4 @@ [assembly: AssemblyTitle("Core.Common.Geometry")] [assembly: AssemblyProduct("Core.Common.Geometry")] -[assembly: Guid("208eed07-0937-4dec-8df4-62c24a0a6285")] - +[assembly: Guid("208eed07-0937-4dec-8df4-62c24a0a6285")] \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Appenders/RenderedMessageLogAppender.cs =================================================================== diff -u -reff889238a2ecfab9aacabe9b99a35c6989006d9 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Appenders/RenderedMessageLogAppender.cs (.../RenderedMessageLogAppender.cs) (revision eff889238a2ecfab9aacabe9b99a35c6989006d9) +++ Core/Common/src/Core.Common.Gui/Appenders/RenderedMessageLogAppender.cs (.../RenderedMessageLogAppender.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -20,7 +20,6 @@ // All rights reserved. using System; - using log4net.Appender; using log4net.Core; Index: Core/Common/src/Core.Common.Gui/Attributes/DynamicReadOnlyValidationMethodAttribute.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Attributes/DynamicReadOnlyValidationMethodAttribute.cs (.../DynamicReadOnlyValidationMethodAttribute.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Core/Common/src/Core.Common.Gui/Attributes/DynamicReadOnlyValidationMethodAttribute.cs (.../DynamicReadOnlyValidationMethodAttribute.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -22,7 +22,6 @@ using System; using System.Linq; using System.Reflection; - using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources; namespace Core.Common.Gui.Attributes Index: Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleAttribute.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleAttribute.cs (.../DynamicVisibleAttribute.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleAttribute.cs (.../DynamicVisibleAttribute.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -22,7 +22,6 @@ using System; using System.ComponentModel; using System.Reflection; - using Core.Common.Gui.Properties; namespace Core.Common.Gui.Attributes Index: Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleValidationMethodAttribute.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleValidationMethodAttribute.cs (.../DynamicVisibleValidationMethodAttribute.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Core/Common/src/Core.Common.Gui/Attributes/DynamicVisibleValidationMethodAttribute.cs (.../DynamicVisibleValidationMethodAttribute.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -22,7 +22,6 @@ using System; using System.Linq; using System.Reflection; - using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources; namespace Core.Common.Gui.Attributes @@ -59,7 +58,7 @@ private static IsPropertyVisible CreateIsPropertyVisibleDelegate(object target, MethodInfo methodInfo) { - return (IsPropertyVisible)Delegate.CreateDelegate(typeof(IsPropertyVisible), target, methodInfo); + return (IsPropertyVisible) Delegate.CreateDelegate(typeof(IsPropertyVisible), target, methodInfo); } private static void ValidateMethodInfo(MethodInfo methodInfo) Index: Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilderException.cs =================================================================== diff -u -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilderException.cs (.../ContextMenuBuilderException.cs) (revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5) +++ Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilderException.cs (.../ContextMenuBuilderException.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -32,19 +32,15 @@ /// /// Initializes a new instance of the class. /// - public ContextMenuBuilderException() - { - } + public ContextMenuBuilderException() {} /// /// Initializes a new instance of the class /// with a specified error message. /// /// The message that describes the error. public ContextMenuBuilderException(string message) - : base(message) - { - } + : base(message) {} /// /// Initializes a new instance of the class with a specified error message @@ -53,6 +49,6 @@ /// The error message that explains the reason for the exception. /// The exception that is the cause of the current exception, or a /// null reference if no inner exception is specified. - public ContextMenuBuilderException(string message, Exception innerException) : base(message, innerException) { } + public ContextMenuBuilderException(string message, Exception innerException) : base(message, innerException) {} } } \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilderProvider.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilderProvider.cs (.../IContextMenuBuilderProvider.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilderProvider.cs (.../IContextMenuBuilderProvider.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -20,7 +20,6 @@ // All rights reserved. using System.Windows.Forms; - using Core.Common.Controls.TreeView; namespace Core.Common.Gui.ContextMenu Index: Core/Common/src/Core.Common.Gui/Converters/PngToIconConverter.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Converters/PngToIconConverter.cs (.../PngToIconConverter.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Common/src/Core.Common.Gui/Converters/PngToIconConverter.cs (.../PngToIconConverter.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -37,7 +37,7 @@ public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { MemoryStream ms = new MemoryStream(); - ((Bitmap)value).Save(ms, ImageFormat.Png); + ((Bitmap) value).Save(ms, ImageFormat.Png); var image = new BitmapImage(); image.BeginInit(); Index: Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs =================================================================== diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs (.../IProjectExplorer.cs) (revision 7f759fbabca9c41e75d229269f1b21581b373b5f) +++ Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs (.../IProjectExplorer.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -27,5 +27,5 @@ /// /// View to show the contents of a instance. /// - public interface IProjectExplorer : ISelectionProvider { } + public interface IProjectExplorer : ISelectionProvider {} } \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml =================================================================== diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed) +++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -140,7 +140,7 @@ - + Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs =================================================================== diff -u -r0d22462e91eb69208ab2aee6ed2c621d31006b02 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 0d22462e91eb69208ab2aee6ed2c621d31006b02) +++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -36,7 +36,6 @@ using Core.Common.Gui.Selection; using Core.Common.Gui.Settings; using Fluent; -using Button = Fluent.Button; using WindowsFormApplication = System.Windows.Forms.Application; namespace Core.Common.Gui.Forms.MainWindow @@ -229,6 +228,26 @@ InitPropertiesWindowAndActivate(); } + public void ValidateItems() + { + if (gui == null) + { + return; + } + + UpdateToolWindowButtonState(); + + if (ribbonCommandHandlers == null) + { + return; + } + + foreach (var ribbonCommandHandler in ribbonCommandHandlers) + { + ribbonCommandHandler.ValidateItems(); + } + } + public void Dispose() { if (IsWindowDisposed) @@ -284,26 +303,6 @@ viewController.ViewHost.SetImage(propertyGrid, Properties.Resources.PropertiesHS); } - public void ValidateItems() - { - if (gui == null) - { - return; - } - - UpdateToolWindowButtonState(); - - if (ribbonCommandHandlers == null) - { - return; - } - - foreach (var ribbonCommandHandler in ribbonCommandHandlers) - { - ribbonCommandHandler.ValidateItems(); - } - } - private void OnActiveDocumentViewChanging(object sender, EventArgs e) { if (Ribbon.SelectedTabItem != null && !Ribbon.SelectedTabItem.IsContextual) @@ -441,7 +440,7 @@ // get all ribbon controls ribbonCommandHandlers = pluginsHost.Plugins.Where(p => p.RibbonCommandHandler != null).Select(p => p.RibbonCommandHandler).ToArray(); - foreach (var ribbonControl in ribbonCommandHandlers.Select(rch => rch.GetRibbonControl())) + foreach (var ribbonControl in ribbonCommandHandlers.Select(rch => rch.GetRibbonControl())) { // fill contextual groups from plugins foreach (var group in ribbonControl.ContextualGroups.Where(group => Ribbon.ContextualGroups.All(g => g.Name != group.Name))) Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs =================================================================== diff -u -r901c8d61a3635b5083280424f35039860a67d185 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs (.../MessageWindow.cs) (revision 901c8d61a3635b5083280424f35039860a67d185) +++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs (.../MessageWindow.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -35,15 +35,6 @@ /// public partial class MessageWindow : UserControl, IMessageWindow { - #region Constants referring to the item-names of the ImageList - - private const string errorLevelImageName = "exclamation.png"; - private const string warningLevelImageName = "error.png"; - private const string informationLevelImageName = "information.png"; - private const string debugLevelImageName = "debug.png"; - - #endregion - private readonly IWin32Window dialogParent; private readonly Dictionary levelImageName; private readonly ConcurrentQueue newMessages = new ConcurrentQueue(); @@ -105,6 +96,24 @@ #endregion + #region IMessageWindow Members + + public void AddMessage(Level level, DateTime time, string message) + { + string shortMessage; + using (var reader = new StringReader(message)) + { + shortMessage = reader.ReadLine(); + } + newMessages.Enqueue(new MessageData + { + ImageName = level.ToString(), Time = time, ShortMessage = shortMessage, FullMessage = message + }); + Invalidate(); + } + + #endregion + protected override void OnPaint(PaintEventArgs e) { base.OnPaint(e); @@ -269,7 +278,7 @@ return; } - var messageWindowDialog = new MessageWindowDialog(dialogParent, (string)messagesDataGridView.CurrentRow.Cells[fullMessageColumnDataGridViewTextBoxColumn.Index].Value); + var messageWindowDialog = new MessageWindowDialog(dialogParent, (string) messagesDataGridView.CurrentRow.Cells[fullMessageColumnDataGridViewTextBoxColumn.Index].Value); messageWindowDialog.ShowDialog(); } @@ -282,21 +291,12 @@ public string FullMessage { get; set; } } - #region IMessageWindow Members + #region Constants referring to the item-names of the ImageList - public void AddMessage(Level level, DateTime time, string message) - { - string shortMessage; - using (var reader = new StringReader(message)) - { - shortMessage = reader.ReadLine(); - } - newMessages.Enqueue(new MessageData - { - ImageName = level.ToString(), Time = time, ShortMessage = shortMessage, FullMessage = message - }); - Invalidate(); - } + private const string errorLevelImageName = "exclamation.png"; + private const string warningLevelImageName = "error.png"; + private const string informationLevelImageName = "information.png"; + private const string debugLevelImageName = "debug.png"; #endregion } Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs =================================================================== diff -u -rb743d495d10779d51c8f75b7cb04b5babb4b226f -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs (.../MessageWindowLogAppender.cs) (revision b743d495d10779d51c8f75b7cb04b5babb4b226f) +++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs (.../MessageWindowLogAppender.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -22,10 +22,8 @@ using System; using System.Collections.Generic; using System.Linq; - using Core.Common.Gui.Properties; using Core.Common.Utils.Reflection; - using log4net.Appender; using log4net.Core; using log4net.Util; Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs =================================================================== diff -u -r417a73b409ff3fbf1a9dd69cdd3e882fb25e007f -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 417a73b409ff3fbf1a9dd69cdd3e882fb25e007f) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -38,11 +38,11 @@ /// public partial class ActivityProgressDialog : DialogBase { - private Task task; - private Activity runningActivity; private readonly IEnumerable activities; private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource(); private readonly ProgressReporter progressReporter = new ProgressReporter(); + private Task task; + private Activity runningActivity; /// /// Initializes a new instance of the class. @@ -114,7 +114,7 @@ progressReporter.ReportProgress(() => { // Update the progress bar - progressBar.Value = (int) Math.Round(100.0 / activityCount * (i + 1)); + progressBar.Value = (int) Math.Round(100.0/activityCount*(i + 1)); }); } }, cancellationToken); Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs =================================================================== diff -u -ra84ad0dc60c583bc68f6c95c57f3499e16a5f3d1 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs (.../ActivityProgressDialogRunner.cs) (revision a84ad0dc60c583bc68f6c95c57f3499e16a5f3d1) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs (.../ActivityProgressDialogRunner.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -37,7 +37,10 @@ /// The activity to be executed. public static void Run(IWin32Window dialogParent, Activity activity) { - Run(dialogParent, new[] { activity }); + Run(dialogParent, new[] + { + activity + }); } /// @@ -55,4 +58,4 @@ } } } -} +} \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/IPropertyResolver.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/IPropertyResolver.cs (.../IPropertyResolver.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/IPropertyResolver.cs (.../IPropertyResolver.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -24,7 +24,7 @@ /// /// Interface for an object that is used to retrieve property objects corresponding to a data-object. /// - public interface IPropertyResolver + public interface IPropertyResolver { /// /// Returns object properties based on the provided . Index: Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyResolver.cs =================================================================== diff -u -r67980a5c3c5cb71c185278e849b123e7f92990eb -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyResolver.cs (.../PropertyResolver.cs) (revision 67980a5c3c5cb71c185278e849b123e7f92990eb) +++ Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyResolver.cs (.../PropertyResolver.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -22,7 +22,6 @@ using System; using System.Collections.Generic; using System.Linq; - using Core.Common.Gui.Plugin; using Core.Common.Gui.Properties; using Core.Common.Gui.PropertyBag; Index: Core/Common/src/Core.Common.Gui/Forms/ViewHost/DocumentViewController.cs =================================================================== diff -u -r0d22462e91eb69208ab2aee6ed2c621d31006b02 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Forms/ViewHost/DocumentViewController.cs (.../DocumentViewController.cs) (revision 0d22462e91eb69208ab2aee6ed2c621d31006b02) +++ Core/Common/src/Core.Common.Gui/Forms/ViewHost/DocumentViewController.cs (.../DocumentViewController.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -117,7 +117,7 @@ return; } - foreach (var view in viewHost.DocumentViews.Where(view => ShouldRemoveViewForData(view, data)).ToArray()) + foreach (var view in viewHost.DocumentViews.Where(view => ShouldRemoveViewForData(view, data)).ToArray()) { viewHost.Remove(view); } Index: Core/Common/src/Core.Common.Gui/GuiCore.cs =================================================================== diff -u -r0d22462e91eb69208ab2aee6ed2c621d31006b02 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/GuiCore.cs (.../GuiCore.cs) (revision 0d22462e91eb69208ab2aee6ed2c621d31006b02) +++ Core/Common/src/Core.Common.Gui/GuiCore.cs (.../GuiCore.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -136,11 +136,6 @@ #endregion - public void Dispose() - { - Dispose(true); - } - /// /// Runs the user interface, causing all user interface components to initialize, /// loading plugins, opening a saved project and displaying the main window. @@ -167,6 +162,11 @@ MessageWindowLogAppender.Instance.Enabled = true; } + public void Dispose() + { + Dispose(true); + } + public void ExitApplication() { if (isExiting) @@ -643,7 +643,7 @@ private readonly ViewCommandHandler viewCommandHandler; private readonly GuiImportHandler importCommandHandler; private readonly GuiExportHandler exportCommandHandler; - private StorageCommandHandler storageCommandHandler; + private readonly StorageCommandHandler storageCommandHandler; public IApplicationFeatureCommands ApplicationCommands { Index: Core/Common/src/Core.Common.Gui/IGui.cs =================================================================== diff -u -r0d22462e91eb69208ab2aee6ed2c621d31006b02 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/IGui.cs (.../IGui.cs) (revision 0d22462e91eb69208ab2aee6ed2c621d31006b02) +++ Core/Common/src/Core.Common.Gui/IGui.cs (.../IGui.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -41,7 +41,7 @@ /// instance for a given data object for the application to use. /// IPropertyResolver PropertyResolver { get; } - + /// /// Terminates the application. /// Index: Core/Common/src/Core.Common.Gui/Plugin/PropertyInfoExtensions.cs =================================================================== diff -u -r67980a5c3c5cb71c185278e849b123e7f92990eb -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Plugin/PropertyInfoExtensions.cs (.../PropertyInfoExtensions.cs) (revision 67980a5c3c5cb71c185278e849b123e7f92990eb) +++ Core/Common/src/Core.Common.Gui/Plugin/PropertyInfoExtensions.cs (.../PropertyInfoExtensions.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -20,7 +20,6 @@ // All rights reserved. using System; - using Core.Common.Gui.PropertyBag; namespace Core.Common.Gui.Plugin Index: Core/Common/src/Core.Common.Gui/PropertyBag/DynamicPropertyBag.cs =================================================================== diff -u -r0d22462e91eb69208ab2aee6ed2c621d31006b02 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/PropertyBag/DynamicPropertyBag.cs (.../DynamicPropertyBag.cs) (revision 0d22462e91eb69208ab2aee6ed2c621d31006b02) +++ Core/Common/src/Core.Common.Gui/PropertyBag/DynamicPropertyBag.cs (.../DynamicPropertyBag.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; - using Core.Common.Gui.Attributes; using Core.Common.Gui.Forms.PropertyGridView; Index: Core/Common/src/Core.Common.Gui/Selection/IApplicationSelection.cs =================================================================== diff -u -r0ae715fe2b16306e4147fed9749bae67ce186168 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/Selection/IApplicationSelection.cs (.../IApplicationSelection.cs) (revision 0ae715fe2b16306e4147fed9749bae67ce186168) +++ Core/Common/src/Core.Common.Gui/Selection/IApplicationSelection.cs (.../IApplicationSelection.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -29,13 +29,13 @@ public interface IApplicationSelection { /// - /// Gets or sets current selected object(s) within the application. + /// Fired when the application's selection has been changed. /// - object Selection { get; set; } + event EventHandler SelectionChanged; /// - /// Fired when the application's selection has been changed. + /// Gets or sets current selected object(s) within the application. /// - event EventHandler SelectionChanged; + object Selection { get; set; } } } \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/ViewPropertyEditor.cs =================================================================== diff -u -ref1c61d94f2aec3b4ff32fcf03253d7ad386c8e5 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Gui/ViewPropertyEditor.cs (.../ViewPropertyEditor.cs) (revision ef1c61d94f2aec3b4ff32fcf03253d7ad386c8e5) +++ Core/Common/src/Core.Common.Gui/ViewPropertyEditor.cs (.../ViewPropertyEditor.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -22,7 +22,6 @@ using System; using System.ComponentModel; using System.Drawing.Design; - using Core.Common.Gui.Commands; using Core.Common.Gui.PropertyBag; Index: Core/Common/src/Core.Common.IO/Exceptions/CriticalFileReadException.cs =================================================================== diff -u -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.IO/Exceptions/CriticalFileReadException.cs (.../CriticalFileReadException.cs) (revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5) +++ Core/Common/src/Core.Common.IO/Exceptions/CriticalFileReadException.cs (.../CriticalFileReadException.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -33,14 +33,14 @@ /// /// Initializes a new instance of the class. /// - public CriticalFileReadException(){} + public CriticalFileReadException() {} /// /// Initializes a new instance of the class /// with a specified error message. /// /// The error message that explains the reason for the exception. - public CriticalFileReadException(string message) : base(message){} + public CriticalFileReadException(string message) : base(message) {} /// /// Initializes a new instance of the class @@ -50,6 +50,6 @@ /// The error message that explains the reason for the exception. /// The exception that is the cause of the current exception, /// or a null reference if no inner exception is specified. - public CriticalFileReadException(string message, Exception inner) : base(message, inner) { } + public CriticalFileReadException(string message, Exception inner) : base(message, inner) {} } } \ No newline at end of file Index: Core/Common/src/Core.Common.IO/Exceptions/CriticalFileWriteException.cs =================================================================== diff -u -rf62076c7d8b6a65856fbab6a1b34b4234aa319e5 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.IO/Exceptions/CriticalFileWriteException.cs (.../CriticalFileWriteException.cs) (revision f62076c7d8b6a65856fbab6a1b34b4234aa319e5) +++ Core/Common/src/Core.Common.IO/Exceptions/CriticalFileWriteException.cs (.../CriticalFileWriteException.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -33,14 +33,14 @@ /// /// Initializes a new instance of the class. /// - public CriticalFileWriteException() { } + public CriticalFileWriteException() {} /// /// Initializes a new instance of the class /// with a specified error message. /// /// The error message that explains the reason for the exception. - public CriticalFileWriteException(string message) : base(message) { } + public CriticalFileWriteException(string message) : base(message) {} /// /// Initializes a new instance of the class @@ -50,6 +50,6 @@ /// The error message that explains the reason for the exception. /// The exception that is the cause of the current exception, /// or a null reference if no inner exception is specified. - public CriticalFileWriteException(string message, Exception inner) : base(message, inner) { } + public CriticalFileWriteException(string message, Exception inner) : base(message, inner) {} } } \ No newline at end of file Index: Core/Common/src/Core.Common.IO/Readers/StreamReaderHelper.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.IO/Readers/StreamReaderHelper.cs (.../StreamReaderHelper.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Core/Common/src/Core.Common.IO/Readers/StreamReaderHelper.cs (.../StreamReaderHelper.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -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.IO.Exceptions; using Core.Common.Utils.Builders; Index: Core/Common/src/Core.Common.Utils/Attributes/ResourcesCategoryAttribute.cs =================================================================== diff -u -rcb1ceb9c6a3d2d7a7117e68cc3028e0cc4077bdf -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Utils/Attributes/ResourcesCategoryAttribute.cs (.../ResourcesCategoryAttribute.cs) (revision cb1ceb9c6a3d2d7a7117e68cc3028e0cc4077bdf) +++ Core/Common/src/Core.Common.Utils/Attributes/ResourcesCategoryAttribute.cs (.../ResourcesCategoryAttribute.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -42,7 +42,7 @@ /// Resource cannot be found or does /// not have the given resource name. /// Implemented as proposed at http://stackoverflow.com/a/21441892/. - public ResourcesCategoryAttribute(Type resourceType, string resourceName, ushort position = 0, ushort totalCategories = 0) : + public ResourcesCategoryAttribute(Type resourceType, string resourceName, ushort position = 0, ushort totalCategories = 0) : base(ResourceHelper.GetResourceLookup(resourceType, resourceName) .PadLeft(ResourceHelper.GetResourceLookup(resourceType, resourceName).Length + (totalCategories - position), nonPrintableChar)) {} Index: Core/Common/src/Core.Common.Utils/Builders/FileReaderErrorMessageBuilder.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Utils/Builders/FileReaderErrorMessageBuilder.cs (.../FileReaderErrorMessageBuilder.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Common/src/Core.Common.Utils/Builders/FileReaderErrorMessageBuilder.cs (.../FileReaderErrorMessageBuilder.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -47,8 +47,8 @@ public string Build(string errorMessage) { return string.Format("Fout bij het lezen van bestand '{0}'{1}{2}: {3}", - filePath, - location ?? string.Empty, + filePath, + location ?? string.Empty, subject ?? string.Empty, errorMessage); } Index: Core/Common/src/Core.Common.Utils/Drawing/GraphicsExtensions.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Utils/Drawing/GraphicsExtensions.cs (.../GraphicsExtensions.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Common/src/Core.Common.Utils/Drawing/GraphicsExtensions.cs (.../GraphicsExtensions.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -62,7 +62,7 @@ private static ColorMatrix CreateColorMatrixForOpacityChange(float opacity) { - var clippedOpacity = (float)Math.Min(1.0, Math.Max(0.0, opacity)); + var clippedOpacity = (float) Math.Min(1.0, Math.Max(0.0, opacity)); // Define the color matrix to change the alpha value of the image, where 'x' is the opacity-factor. // 1 0 0 0 0 Index: Core/Common/src/Core.Common.Utils/EnumDisplayWrapper.cs =================================================================== diff -u -r0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Utils/EnumDisplayWrapper.cs (.../EnumDisplayWrapper.cs) (revision 0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5) +++ Core/Common/src/Core.Common.Utils/EnumDisplayWrapper.cs (.../EnumDisplayWrapper.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -44,11 +44,11 @@ { if (value == null) { - throw new ArgumentNullException("value", "An Enum type value is required."); + throw new ArgumentNullException("value", "An Enum type value is required."); } if (!(typeof(Enum).IsAssignableFrom(typeof(T)))) { - throw new InvalidTypeParameterException("T", "The type parameter has to be an Enum type."); + throw new InvalidTypeParameterException("T", "The type parameter has to be an Enum type."); } Value = value; SetDisplayName(value); Index: Core/Common/src/Core.Common.Utils/EnumTypeConverter.cs =================================================================== diff -u -r0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Utils/EnumTypeConverter.cs (.../EnumTypeConverter.cs) (revision 0efb28b7f5a708daa1cf9e8aeba6b8f84a3ebaf5) +++ Core/Common/src/Core.Common.Utils/EnumTypeConverter.cs (.../EnumTypeConverter.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -65,7 +65,7 @@ private static string GetDisplayName(MemberInfo memberInfo) { - var resourcesDisplayNameAttribute = (ResourcesDisplayNameAttribute)Attribute.GetCustomAttribute(memberInfo, typeof(ResourcesDisplayNameAttribute)); + var resourcesDisplayNameAttribute = (ResourcesDisplayNameAttribute) Attribute.GetCustomAttribute(memberInfo, typeof(ResourcesDisplayNameAttribute)); return (resourcesDisplayNameAttribute != null) ? resourcesDisplayNameAttribute.DisplayName : null; } } Index: Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs =================================================================== diff -u -r0d22462e91eb69208ab2aee6ed2c621d31006b02 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs (.../AssemblyUtils.cs) (revision 0d22462e91eb69208ab2aee6ed2c621d31006b02) +++ Core/Common/src/Core.Common.Utils/Reflection/AssemblyUtils.cs (.../AssemblyUtils.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -136,7 +136,7 @@ catch (InvalidOperationException e) { var message = string.Format("Cannot find embedded resource file '{0}' in '{1}.", - fileName, assembly.FullName); + fileName, assembly.FullName); throw new ArgumentException(message, "fileName", e); } } Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs =================================================================== diff -u -rbe9428984d28fcbd8f6089f1c1184cd9763c18bf -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision be9428984d28fcbd8f6089f1c1184cd9763c18bf) +++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -24,7 +24,6 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; - using Core.Common.Utils.Properties; namespace Core.Common.Utils.Reflection @@ -105,7 +104,7 @@ throw new ArgumentOutOfRangeException("fieldName"); } - return (T)fieldInfo.GetValue(instance); + return (T) fieldInfo.GetValue(instance); } /// @@ -157,7 +156,7 @@ throw new ArgumentOutOfRangeException("methodName"); } - return (T)methodInfo.Invoke(instance, arguments); + return (T) methodInfo.Invoke(instance, arguments); } /// Index: Core/Common/src/Core.Common.Utils/StatisticsConverter.cs =================================================================== diff -u -r7ec5d40014c7ff2faaba8fe3bef778a9d728cc37 -r95734a1c508bcca7ed8943612f1d890f653df3d0 --- Core/Common/src/Core.Common.Utils/StatisticsConverter.cs (.../StatisticsConverter.cs) (revision 7ec5d40014c7ff2faaba8fe3bef778a9d728cc37) +++ Core/Common/src/Core.Common.Utils/StatisticsConverter.cs (.../StatisticsConverter.cs) (revision 95734a1c508bcca7ed8943612f1d890f653df3d0) @@ -35,7 +35,7 @@ /// The probability. public static double NormToBeta(double norm) { - return -Normal.InvCDF(0.0, 1.0, 1.0 / norm); + return -Normal.InvCDF(0.0, 1.0, 1.0/norm); } } } \ No newline at end of file