Renamed conductor view models

Caliban-Nano · Jun 7, 2022 · 963198c · 963198c
1 parent e843afe
commit 963198c
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 22 deletions.
diff --git a/samples/Caliban.Nano.Hello/Caliban.Nano.Hello.csproj b/samples/Caliban.Nano.Hello/Caliban.Nano.Hello.csproj
@@ -8,6 +8,7 @@
     <BaseOutputPath>..\..\artifacts</BaseOutputPath>
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <ApplicationIcon>app.ico</ApplicationIcon>
+    <EnableNETAnalyzers>False</EnableNETAnalyzers>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Caliban.Nano.Hello/UI/Shell/ShellViewModel.cs b/samples/Caliban.Nano.Hello/UI/Shell/ShellViewModel.cs
@@ -6,7 +6,7 @@
 
 namespace Caliban.Nano.Hello.UI.Shell
 {
-    public sealed class ShellViewModel : ViewModel.ActiveOne, IWindow, IHandle<string>
+    public sealed class ShellViewModel : ViewModel.Single, IWindow, IHandle<string>
     {
         public IEventAggregator Events { get; init; }
         public string DisplayName => "Hello";

diff --git a/src/Caliban.Nano/Caliban.Nano.csproj b/src/Caliban.Nano/Caliban.Nano.csproj
@@ -20,9 +20,10 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Company>Caliban.Nano</Company>
     <PackageTags>caliban;nano;wpf;mvvm;framework;dependency-injection;event-aggregation;service-locator;automatic-binding</PackageTags>
-    <VersionPrefix>1.6.0</VersionPrefix>
+    <VersionPrefix>1.7.0</VersionPrefix>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <DocumentationFile>..\..\docs\api.xml</DocumentationFile>
+    <EnableNETAnalyzers>False</EnableNETAnalyzers>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Caliban.Nano/UI/ViewModel.ActiveAll.cs → src/Caliban.Nano/UI/ViewModel.Multiple.cs b/src/Caliban.Nano/UI/ViewModel.ActiveAll.cs → src/Caliban.Nano/UI/ViewModel.Multiple.cs
@@ -8,7 +8,7 @@ public abstract partial class ViewModel
         /// <summary>
         /// A composition conductor for multiple active view models.
         /// </summary>
-        public abstract class ActiveAll : ViewModel, IParent
+        public abstract class Multiple : ViewModel, IParent
         {
             /// <inheritdoc />
             public event Action<IViewModel> ActiveChanged;
@@ -25,7 +25,7 @@ public abstract class ActiveAll : ViewModel, IParent
             /// Initializes a new instance of this class with bounded event.
             /// </summary>
             /// <param name="parent">The optional parent view model.</param>
-            public ActiveAll(IViewModel? parent = null) : base(parent)
+            public Multiple(IViewModel? parent = null) : base(parent)
             {
                 ActiveChanged += (_) => NotifyPropertyChanged(() => ActiveItems);
             }

diff --git a/src/Caliban.Nano/UI/ViewModel.ActiveOne.cs → src/Caliban.Nano/UI/ViewModel.Single.cs b/src/Caliban.Nano/UI/ViewModel.ActiveOne.cs → src/Caliban.Nano/UI/ViewModel.Single.cs
@@ -8,7 +8,7 @@ public abstract partial class ViewModel
         /// <summary>
         /// A composition conductor for single active view models.
         /// </summary>
-        public abstract class ActiveOne : ViewModel, IParent
+        public abstract class Single : ViewModel, IParent
         {
             /// <inheritdoc />
             public event Action<IViewModel> ActiveChanged;
@@ -25,7 +25,7 @@ public abstract class ActiveOne : ViewModel, IParent
             /// Initializes a new instance of this class with bounded event.
             /// </summary>
             /// <param name="parent">The optional parent view model.</param>
-            public ActiveOne(IViewModel? parent = null) : base(parent)
+            public Single(IViewModel? parent = null) : base(parent)
             {
                 ActiveChanged += (_) => NotifyPropertyChanged(() => ActiveItem);
             }

diff --git a/src/Caliban.Nano/UI/ViewModel.cs b/src/Caliban.Nano/UI/ViewModel.cs
@@ -1,4 +1,5 @@
 using Caliban.Nano.Contracts;
+using Caliban.Nano.Data;
 
 namespace Caliban.Nano.UI
 {

diff --git a/tests/Caliban.Nano.Tests/Mocks/MockClass.cs b/tests/Caliban.Nano.Tests/Mocks/MockClass.cs
@@ -1,5 +1,5 @@
 using System;
-using Caliban.Nano.UI;
+using Caliban.Nano.Data;
 
 namespace Caliban.Nano.Tests.Mocks
 {

diff --git a/tests/Caliban.Nano.Tests/Mocks/MockView.cs b/tests/Caliban.Nano.Tests/Mocks/MockView.cs
@@ -1,7 +1,7 @@
 namespace Caliban.Nano.Tests.Mocks
 {
     internal sealed class MockView { }
-    internal sealed class MockAllView { }
-    internal sealed class MockOneView { }
+    internal sealed class MockMultipleView { }
+    internal sealed class MockSingleView { }
     internal sealed class MockFailView { }
 }
diff --git a/tests/Caliban.Nano.Tests/Mocks/MockViewModel.cs b/tests/Caliban.Nano.Tests/Mocks/MockViewModel.cs
@@ -8,9 +8,9 @@ internal sealed class MockViewModel : ViewModel
     {
         public MockViewModel(IViewModel? parent = null) : base(parent) { }
     }
-    internal sealed class MockAllViewModel : ViewModel.ActiveAll { }
-    internal sealed class MockOneViewModel : ViewModel.ActiveOne { }
-    internal sealed class MockSoloViewModel : ViewModel { }
+    internal sealed class MockMultipleViewModel : ViewModel.Multiple { }
+    internal sealed class MockSingleViewModel : ViewModel.Single { }
+    internal sealed class MockOnlyViewModel : ViewModel { }
     internal sealed class MockFailViewModel : ViewModel
     {
         private readonly bool _doActivate;

diff --git a/tests/Caliban.Nano.Tests/UI/ViewModelTests.cs b/tests/Caliban.Nano.Tests/UI/ViewModelTests.cs
@@ -53,14 +53,14 @@ public void BindFailedTest()
 
             Trace.Listeners.Add(new TextWriterTraceListener(writer));
 
-            var mock = new MockSoloViewModel();
+            var mock = new MockOnlyViewModel();
 
             Assert.IsNull(mock.View);
             Assert.IsNull(mock.Model);
             Assert.IsFalse(mock.IsActive);
             Assert.IsTrue(mock.CanClose);
             Assert.IsNull(mock.Parent);
-            Assert.IsTrue(writer.ToString().Contains("Type MockSoloView could not be found"));
+            Assert.IsTrue(writer.ToString().Contains("Type MockOnlyView could not be found"));
         }
 
         [TestMethod]
@@ -98,7 +98,7 @@ public async Task CloseTest()
         [TestMethod]
         public async Task CloseItemAllTest()
         {
-            var parent = new MockOneViewModel();
+            var parent = new MockSingleViewModel();
             var child = new MockViewModel(parent);
 
             Assert.IsTrue(await parent.ActivateItem(child));
@@ -110,7 +110,7 @@ public async Task CloseItemAllTest()
         [TestMethod]
         public async Task CloseItemOneTest()
         {
-            var parent = new MockAllViewModel();
+            var parent = new MockMultipleViewModel();
             var child = new MockViewModel(parent);
 
             Assert.IsTrue(await parent.ActivateItem(child));
@@ -142,16 +142,16 @@ public async Task OnDeactivateTest()
         }
 
         [TestClass]
-        public sealed class ActiveAllTests
+        public sealed class MultipleTests
         {
-            private ViewModel.ActiveAll? Mock { get; set; }
+            private ViewModel.Multiple? Mock { get; set; }
 
             [TestInitialize]
             public void Initialize()
             {
                 TypeFinder.Sources.Add(GetType().Assembly);
 
-                Mock = new MockAllViewModel();
+                Mock = new MockMultipleViewModel();
             }
 
             [TestMethod]
@@ -292,16 +292,16 @@ public async Task DeactivateItemCloseTest()
         }
 
         [TestClass]
-        public sealed class ActiveOneTests
+        public sealed class SingleTests
         {
-            private ViewModel.ActiveOne? Mock { get; set; }
+            private ViewModel.Single? Mock { get; set; }
 
             [TestInitialize]
             public void Initialize()
             {
                 TypeFinder.Sources.Add(GetType().Assembly);
 
-                Mock = new MockOneViewModel();
+                Mock = new MockSingleViewModel();
             }
 
             [TestMethod]