Index: Core/Common/src/Core.Common.Controls/BorderedLabel.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/BorderedLabel.cs (revision 0)
+++ Core/Common/src/Core.Common.Controls/BorderedLabel.cs (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -0,0 +1,45 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Core.Common.Controls
+{
+ ///
+ /// Custom control with a border.
+ ///
+ public sealed class BorderedLabel : Label
+ {
+ ///
+ /// Creates a new instance of .
+ ///
+ public BorderedLabel()
+ {
+ AutoSize = true;
+ BorderStyle = BorderStyle.FixedSingle;
+ Dock = DockStyle.Fill;
+ MinimumSize = new Size(50, 0);
+ Padding = new Padding(5, 0, 5, 0);
+ TextAlign = ContentAlignment.MiddleLeft;
+ }
+ }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -red0f008eb876e1ad9b838ce0112a3e80576f3845 -r07bb209b7475f9a60cea565c982c47e0562f6daf
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj (.../Core.Common.Controls.csproj) (revision ed0f008eb876e1ad9b838ce0112a3e80576f3845)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj (.../Core.Common.Controls.csproj) (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -13,6 +13,9 @@
+
+ Component
+
Index: Core/Common/test/Core.Common.Controls.Test/BorderedLabelTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Controls.Test/BorderedLabelTest.cs (revision 0)
+++ Core/Common/test/Core.Common.Controls.Test/BorderedLabelTest.cs (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -0,0 +1,47 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Drawing;
+using System.Windows.Forms;
+using NUnit.Framework;
+
+namespace Core.Common.Controls.Test
+{
+ [TestFixture]
+ public class BorderedLabelTest
+ {
+ [Test]
+ public void DefaultConstructor_ExpectedValues()
+ {
+ // Call
+ var borderedLabel = new BorderedLabel();
+
+ // Assert
+ Assert.IsInstanceOf
+
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.Designer.cs
===================================================================
diff -u -rb0dc46315e824778c8f43d8956f958376a3b802f -r07bb209b7475f9a60cea565c982c47e0562f6daf
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.Designer.cs (.../AssemblyResultControl.Designer.cs) (revision b0dc46315e824778c8f43d8956f958376a3b802f)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultControl.Designer.cs (.../AssemblyResultControl.Designer.cs) (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -19,16 +19,11 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using System.Windows.Forms;
+using Core.Common.Controls;
namespace Ringtoets.Common.Forms.Controls
{
-#if DEVELOPMENT
- partial class AssemblyResultControl
-#else
- abstract partial class AssemblyResultControl
-#endif
-
+ abstract partial class AssemblyResultControl
{
///
/// Required designer variable.
@@ -59,7 +54,7 @@
this.components = new System.ComponentModel.Container();
this.GroupPanel = new System.Windows.Forms.TableLayoutPanel();
this.ErrorProvider = new System.Windows.Forms.ErrorProvider(this.components);
- this.GroupLabel = new Ringtoets.Common.Forms.Controls.BorderedLabel();
+ this.GroupLabel = new BorderedLabel();
this.GroupPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ErrorProvider)).BeginInit();
this.SuspendLayout();
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs
===================================================================
diff -u -r60a332bf77395113bfceb050c21eed6b9bbf304f -r07bb209b7475f9a60cea565c982c47e0562f6daf
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs (.../AssemblyResultWithProbabilityControl.Designer.cs) (revision 60a332bf77395113bfceb050c21eed6b9bbf304f)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs (.../AssemblyResultWithProbabilityControl.Designer.cs) (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -19,6 +19,8 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using Core.Common.Controls;
+
namespace Ringtoets.Common.Forms.Controls
{
partial class AssemblyResultWithProbabilityControl
@@ -50,7 +52,7 @@
private void InitializeComponent()
{
this.probabilityPanel = new System.Windows.Forms.TableLayoutPanel();
- this.ProbabilityLabel = new Ringtoets.Common.Forms.Controls.BorderedLabel();
+ this.ProbabilityLabel = new BorderedLabel();
((System.ComponentModel.ISupportInitialize)(this.ErrorProvider)).BeginInit();
this.probabilityPanel.SuspendLayout();
this.SuspendLayout();
Fisheye: Tag 07bb209b7475f9a60cea565c982c47e0562f6daf refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Controls/BorderedLabel.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f -r07bb209b7475f9a60cea565c982c47e0562f6daf
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -150,9 +150,6 @@
-
- Component
-
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultControlTest.cs
===================================================================
diff -u -r96e729865d3978156ee7d869c1f45f51dae51bcd -r07bb209b7475f9a60cea565c982c47e0562f6daf
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultControlTest.cs (.../AssemblyResultControlTest.cs) (revision 96e729865d3978156ee7d869c1f45f51dae51bcd)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultControlTest.cs (.../AssemblyResultControlTest.cs) (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -22,6 +22,7 @@
using System;
using System.Drawing;
using System.Windows.Forms;
+using Core.Common.Controls;
using Core.Common.TestUtil;
using Core.Common.Util.Reflection;
using NUnit.Framework;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultWithProbabilityControlTest.cs
===================================================================
diff -u -r60a332bf77395113bfceb050c21eed6b9bbf304f -r07bb209b7475f9a60cea565c982c47e0562f6daf
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultWithProbabilityControlTest.cs (.../AssemblyResultWithProbabilityControlTest.cs) (revision 60a332bf77395113bfceb050c21eed6b9bbf304f)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/AssemblyResultWithProbabilityControlTest.cs (.../AssemblyResultWithProbabilityControlTest.cs) (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -22,6 +22,7 @@
using System;
using System.Drawing;
using System.Windows.Forms;
+using Core.Common.Controls;
using Core.Common.TestUtil;
using Core.Common.Util.Reflection;
using NUnit.Framework;
Fisheye: Tag 07bb209b7475f9a60cea565c982c47e0562f6daf refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Controls/BorderedLabelTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -rce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f -r07bb209b7475f9a60cea565c982c47e0562f6daf
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision ce7c1e5c5a8aec0020b1ef5cf50bf3c20d3d4c2f)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -54,7 +54,6 @@
-
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs
===================================================================
diff -u -ra09c9d7f2bb8b72067389c66bb03a086e07f6093 -r07bb209b7475f9a60cea565c982c47e0562f6daf
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision a09c9d7f2bb8b72067389c66bb03a086e07f6093)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -24,6 +24,7 @@
using System.Drawing;
using System.Windows.Forms;
using Core.Common.Base;
+using Core.Common.Controls;
using Core.Common.Controls.DataGrid;
using Core.Common.Controls.Views;
using Core.Common.TestUtil;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTester.cs
===================================================================
diff -u -ra09c9d7f2bb8b72067389c66bb03a086e07f6093 -r07bb209b7475f9a60cea565c982c47e0562f6daf
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTester.cs (.../FailureMechanismAssemblyCategoryGroupControlTester.cs) (revision a09c9d7f2bb8b72067389c66bb03a086e07f6093)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTester.cs (.../FailureMechanismAssemblyCategoryGroupControlTester.cs) (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -22,6 +22,7 @@
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
+using Core.Common.Controls;
using Core.Common.Util.Reflection;
using NUnit.Extensions.Forms;
using NUnit.Framework;
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTester.cs
===================================================================
diff -u -ra09c9d7f2bb8b72067389c66bb03a086e07f6093 -r07bb209b7475f9a60cea565c982c47e0562f6daf
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTester.cs (.../FailureMechanismAssemblyResultWithProbabilityControlTester.cs) (revision a09c9d7f2bb8b72067389c66bb03a086e07f6093)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTester.cs (.../FailureMechanismAssemblyResultWithProbabilityControlTester.cs) (revision 07bb209b7475f9a60cea565c982c47e0562f6daf)
@@ -22,6 +22,7 @@
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
+using Core.Common.Controls;
using Core.Common.Util.Reflection;
using NUnit.Extensions.Forms;
using NUnit.Framework;