Index: Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsPlugin.cs =================================================================== diff -u -r6e845a0b1d5f44725933c313a72975f749f7d3a8 -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsPlugin.cs (.../CommonToolsPlugin.cs) (revision 6e845a0b1d5f44725933c313a72975f749f7d3a8) +++ Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsPlugin.cs (.../CommonToolsPlugin.cs) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -20,11 +20,9 @@ // All rights reserved. using System.Collections.Generic; -using Core.Common.Base.Data; using Core.Common.Gui.Forms; using Core.Common.Gui.Plugin; using Core.Common.Gui.Properties; -using Core.Plugins.CommonTools.PropertyClasses; namespace Core.Plugins.CommonTools { @@ -33,11 +31,6 @@ /// public class CommonToolsPlugin : PluginBase { - public override IEnumerable GetPropertyInfos() - { - yield return new PropertyInfo(); - } - public override IEnumerable GetViewInfos() { yield return new ViewInfo Index: Core/Plugins/src/Core.Plugins.CommonTools/Core.Plugins.CommonTools.csproj =================================================================== diff -u -r6e845a0b1d5f44725933c313a72975f749f7d3a8 -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Core/Plugins/src/Core.Plugins.CommonTools/Core.Plugins.CommonTools.csproj (.../Core.Plugins.CommonTools.csproj) (revision 6e845a0b1d5f44725933c313a72975f749f7d3a8) +++ Core/Plugins/src/Core.Plugins.CommonTools/Core.Plugins.CommonTools.csproj (.../Core.Plugins.CommonTools.csproj) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -49,12 +49,6 @@ Properties\GlobalAssembly.cs - - True - True - Resources.resx - - @@ -63,10 +57,6 @@ - - {3BBFD65B-B277-4E50-AE6D-BD24C3434609} - Core.Common.Base - {9a2d67e6-26ac-4d17-b11a-2b4372f2f572} Core.Common.Controls @@ -77,22 +67,11 @@ Core.Common.Gui False - - {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} - Core.Common.Utils - {c90b77da-e421-43cc-b82e-529651bc21ac} Core.Common.Version False - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - \ No newline at end of file Fisheye: Tag 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.CommonTools/Properties/Resources.resx'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.CommonTools/PropertyClasses/ProjectProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsPluginTest.cs =================================================================== diff -u -r6e845a0b1d5f44725933c313a72975f749f7d3a8 -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsPluginTest.cs (.../CommonToolsPluginTest.cs) (revision 6e845a0b1d5f44725933c313a72975f749f7d3a8) +++ Core/Plugins/test/Core.Plugins.CommonTools.Test/CommonToolsPluginTest.cs (.../CommonToolsPluginTest.cs) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -20,11 +20,9 @@ // All rights reserved. using System.Linq; -using Core.Common.Base.Data; using Core.Common.Gui.Forms; using Core.Common.Gui.Properties; using Core.Common.TestUtil; -using Core.Plugins.CommonTools.PropertyClasses; using NUnit.Framework; namespace Core.Plugins.CommonTools.Test @@ -33,23 +31,6 @@ public class CommonToolsPluginTest { [Test] - public void GetCommonToolsPluginProperties_Always_ReturnProperties() - { - // Setup - var plugin = new CommonToolsPlugin(); - - // Call - var propertyInfos = plugin.GetPropertyInfos().ToList(); - - // Assert - Assert.AreEqual(1, propertyInfos.Count); - - var projectPropertyInfo = propertyInfos.First(pi => pi.DataType == typeof(IProject)); - - Assert.AreEqual(typeof(ProjectProperties), projectPropertyInfo.PropertyObjectType); - } - - [Test] public void GetCommonToolsPluginProperties_Always_ReturnViews() { // Setup Index: Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj =================================================================== diff -u -r6e845a0b1d5f44725933c313a72975f749f7d3a8 -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj (.../Core.Plugins.CommonTools.Test.csproj) (revision 6e845a0b1d5f44725933c313a72975f749f7d3a8) +++ Core/Plugins/test/Core.Plugins.CommonTools.Test/Core.Plugins.CommonTools.Test.csproj (.../Core.Plugins.CommonTools.Test.csproj) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -73,13 +73,8 @@ - - - {3bbfd65b-b277-4e50-ae6d-bd24c3434609} - Core.Common.Base - {D749EE4C-CE50-4C17-BF01-9A953028C126} Core.Common.TestUtil Fisheye: Tag 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.CommonTools.Test/PropertyClasses/ProjectPropertiesTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r22d01e841d2ecdf9249422f7436625eb7fc5ea17 -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 22d01e841d2ecdf9249422f7436625eb7fc5ea17) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -528,6 +528,42 @@ } /// + /// Looks up a localized string similar to Korte beschrijving van het project.. + /// + public static string RingtoetsProjectProperties_Description_Description { + get { + return ResourceManager.GetString("RingtoetsProjectProperties_Description_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Omschrijving. + /// + public static string RingtoetsProjectProperties_Description_DisplayName { + get { + return ResourceManager.GetString("RingtoetsProjectProperties_Description_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Naam van het project.. + /// + public static string RingtoetsProjectProperties_Name_Description { + get { + return ResourceManager.GetString("RingtoetsProjectProperties_Name_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Naam. + /// + public static string RingtoetsProjectProperties_Name_DisplayName { + get { + return ResourceManager.GetString("RingtoetsProjectProperties_Name_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Hydraulische randvoorwaardendatabase. /// public static string SelectHydraulicBoundaryDatabaseFile_FilterName { Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -r22d01e841d2ecdf9249422f7436625eb7fc5ea17 -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 22d01e841d2ecdf9249422f7436625eb7fc5ea17) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -278,4 +278,16 @@ ..\Resources\folder-stand32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Korte beschrijving van het project. + + + Omschrijving + + + Naam van het project. + + + Naam + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/RingtoetsProjectProperties.cs =================================================================== diff -u --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/RingtoetsProjectProperties.cs (revision 0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/RingtoetsProjectProperties.cs (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -0,0 +1,63 @@ +// Copyright (C) Stichting Deltares 2016. 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 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 General Public License for more details. +// +// You should have received a copy of the GNU 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 Core.Common.Base.Data; +using Core.Common.Gui.Attributes; +using Core.Common.Gui.PropertyBag; +using Core.Common.Utils.Attributes; +using Ringtoets.Common.Data.Properties; + +namespace Ringtoets.Integration.Forms.PropertyClasses +{ + /// + /// This class describes the presentation of properties of a . + /// + public class RingtoetsProjectProperties : ObjectProperties + { + [PropertyOrder(1)] + [ResourcesCategory(typeof(Resources), "Categories_General")] + [ResourcesDisplayName(typeof(Properties.Resources), "RingtoetsProjectProperties_Name_DisplayName")] + [ResourcesDescription(typeof(Properties.Resources), "RingtoetsProjectProperties_Name_Description")] + public string Name + { + get + { + return data.Name; + } + } + + [PropertyOrder(2)] + [ResourcesCategory(typeof(Resources), "Categories_General")] + [ResourcesDisplayName(typeof(Properties.Resources), "RingtoetsProjectProperties_Description_DisplayName")] + [ResourcesDescription(typeof(Properties.Resources), "RingtoetsProjectProperties_Description_Description")] + public string Description + { + get + { + return data.Description; + } + set + { + data.Description = value; + } + } + } +} \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj =================================================================== diff -u -r22d01e841d2ecdf9249422f7436625eb7fc5ea17 -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 22d01e841d2ecdf9249422f7436625eb7fc5ea17) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -55,6 +55,7 @@ + Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rbd4baf94660bac291a78ee43b16afb20efc3e3c6 -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision bd4baf94660bac291a78ee43b16afb20efc3e3c6) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -246,6 +246,7 @@ /// public override IEnumerable GetPropertyInfos() { + yield return new PropertyInfo(); yield return new PropertyInfo(); yield return new PropertyInfo(); yield return new PropertyInfo, StandAloneFailureMechanismContextProperties>(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs =================================================================== diff -u -ra3de4991e513b548eabc760f084132e936b42cb9 -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs (.../AssessmentSectionPropertiesTest.cs) (revision a3de4991e513b548eabc760f084132e936b42cb9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/AssessmentSectionPropertiesTest.cs (.../AssessmentSectionPropertiesTest.cs) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -1,4 +1,25 @@ -using Core.Common.Base; +// Copyright (C) Stichting Deltares 2016. 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 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 General Public License for more details. +// +// You should have received a copy of the GNU 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 Core.Common.Base; using Core.Common.Gui.PropertyBag; using NUnit.Framework; using Rhino.Mocks; Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/RingtoetsProjectPropertiesTest.cs =================================================================== diff -u --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/RingtoetsProjectPropertiesTest.cs (revision 0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/RingtoetsProjectPropertiesTest.cs (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -0,0 +1,103 @@ +// Copyright (C) Stichting Deltares 2016. 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 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 General Public License for more details. +// +// You should have received a copy of the GNU 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; +using System.ComponentModel; +using Core.Common.Gui.PropertyBag; +using NUnit.Framework; +using Ringtoets.Integration.Data; +using Ringtoets.Integration.Forms.PropertyClasses; + +namespace Ringtoets.Integration.Forms.Test.PropertyClasses +{ + [TestFixture] + public class RingtoetsProjectPropertiesTest + { + [Test] + public void Name_WithData_ReturnsName() + { + // Setup + var project = new RingtoetsProject(); + var properties = new RingtoetsProjectProperties + { + Data = project + }; + + var testName = "some name"; + project.Name = testName; + + // Call + var result = properties.Name; + + // Assert + Assert.AreEqual(testName, result); + } + + [Test] + public void Description_WithData_ReturnsDescription() + { + // Setup + var project = new RingtoetsProject(); + var properties = new RingtoetsProjectProperties + { + Data = project + }; + + var testDescription = "some description"; + var anotherDescription = "another description"; + + project.Description = testDescription; + + // Call + var result = properties.Description; + + // Assert + Assert.AreEqual(testDescription, result); + + // Call + properties.Description = anotherDescription; + + // Assert + Assert.AreEqual(anotherDescription, project.Description); + } + + [Test] + public void GetProperties_Always_ReturnsTwoProperties() + { + // Setup + var data = new RingtoetsProject(); + + var bag = new DynamicPropertyBag(new RingtoetsProjectProperties + { + Data = data + }); + + // Call + var properties = bag.GetProperties(new Attribute[] + { + new BrowsableAttribute(true) + }); + + // Assert + Assert.AreEqual(2, properties.Count); + } + } +} \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj =================================================================== diff -u -r75c007324755a9f899f7fc5639ff873311343bdc -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 75c007324755a9f899f7fc5639ff873311343bdc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -67,6 +67,7 @@ + @@ -151,10 +152,6 @@ {30e4c2ae-719e-4d70-9fa9-668a9767fbfa} Core.Common.Gui - - {E344867E-9AC9-44C8-88A5-8185681679A9} - Core.Common.IO - {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} Core.Common.Utils @@ -187,10 +184,6 @@ {4d840673-3812-4338-a352-84854e32b8a0} Ringtoets.Common.Forms - - {52BA7627-CBAB-4209-BE77-3B5F31378277} - Ringtoets.Common.IO - {4843D6E5-066F-4795-94F5-1D53932DD03C} Ringtoets.Common.Data.TestUtil Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs =================================================================== diff -u -r75c007324755a9f899f7fc5639ff873311343bdc -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 75c007324755a9f899f7fc5639ff873311343bdc) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) @@ -24,6 +24,7 @@ using System.IO; using System.Linq; using System.Windows.Threading; +using Core.Common.Base.Data; using Core.Common.Base.IO; using Core.Common.Base.Storage; using Core.Common.Controls.TreeView; @@ -195,8 +196,14 @@ PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray(); // Assert - Assert.AreEqual(6, propertyInfos.Length); + Assert.AreEqual(7, propertyInfos.Length); + var ringtoetsProjectProperties = propertyInfos.Single(pi => pi.DataType == typeof(IProject)); + Assert.AreEqual(typeof(RingtoetsProjectProperties), ringtoetsProjectProperties.PropertyObjectType); + Assert.IsNull(ringtoetsProjectProperties.AdditionalDataCheck); + Assert.IsNull(ringtoetsProjectProperties.GetObjectPropertiesData); + Assert.IsNull(ringtoetsProjectProperties.AfterCreate); + var assessmentSectionProperties = propertyInfos.Single(pi => pi.DataType == typeof(IAssessmentSection)); Assert.AreEqual(typeof(AssessmentSectionProperties), assessmentSectionProperties.PropertyObjectType); Assert.IsNull(assessmentSectionProperties.AdditionalDataCheck);