Implemented new TryAdd() method

With the new `TryAdd()` method introduced (027ae25), we can now standardize how derived classes handle conditional adds, whereas previously there was a different approach in each of the derived classes. This improves consistency and readability.

Author: JeremyCaney

OnTopic.ViewModels/TopicViewModelLookupService.cs

@@ -35,29 +35,20 @@ public TopicViewModelLookupService(IEnumerable<Type>? types = null, Type? defaul
       /*------------------------------------------------------------------------------------------------------------------------
       | Ensure local view models are accounted for
       \-----------------------------------------------------------------------------------------------------------------------*/
-      AddIfMissing(typeof(ContentItemTopicViewModel));
-      AddIfMissing(typeof(ContentListTopicViewModel));
-      AddIfMissing(typeof(IndexTopicViewModel));
-      AddIfMissing(typeof(ItemTopicViewModel));
-      AddIfMissing(typeof(ListTopicViewModel));
-      AddIfMissing(typeof(LookupListItemTopicViewModel));
-      AddIfMissing(typeof(NavigationTopicViewModel));
-      AddIfMissing(typeof(PageGroupTopicViewModel));
-      AddIfMissing(typeof(PageTopicViewModel));
-      AddIfMissing(typeof(SectionTopicViewModel));
-      AddIfMissing(typeof(SlideTopicViewModel));
-      AddIfMissing(typeof(SlideshowTopicViewModel));
-      AddIfMissing(typeof(TopicViewModel));
-      AddIfMissing(typeof(VideoTopicViewModel));
-
-      /*------------------------------------------------------------------------------------------------------------------------
-      | Function: Add If Missing
-      \-----------------------------------------------------------------------------------------------------------------------*/
-      void AddIfMissing(Type type) {
-        if (!Contains(type.Name)) {
-          Add(type);
-        }
-      }
+      TryAdd(typeof(ContentItemTopicViewModel));
+      TryAdd(typeof(ContentListTopicViewModel));
+      TryAdd(typeof(IndexTopicViewModel));
+      TryAdd(typeof(ItemTopicViewModel));
+      TryAdd(typeof(ListTopicViewModel));
+      TryAdd(typeof(LookupListItemTopicViewModel));
+      TryAdd(typeof(NavigationTopicViewModel));
+      TryAdd(typeof(PageGroupTopicViewModel));
+      TryAdd(typeof(PageTopicViewModel));
+      TryAdd(typeof(SectionTopicViewModel));
+      TryAdd(typeof(SlideTopicViewModel));
+      TryAdd(typeof(SlideshowTopicViewModel));
+      TryAdd(typeof(TopicViewModel));
+      TryAdd(typeof(VideoTopicViewModel));
 
     }
 

OnTopic/DefaultTopicLookupService.cs

@@ -38,24 +38,24 @@ public DefaultTopicLookupService(IEnumerable<Type>? types = null, Type? defaultT
       /*------------------------------------------------------------------------------------------------------------------------
       | Ensure editor types are accounted for
       \-----------------------------------------------------------------------------------------------------------------------*/
-      if (!Contains(nameof(ContentTypeDescriptor)))             Add(typeof(ContentTypeDescriptor));
-      if (!Contains(nameof(AttributeDescriptor)))               Add(typeof(AttributeDescriptor));
-      if (!Contains(nameof(BooleanAttribute)))                  Add(typeof(BooleanAttribute));
-      if (!Contains(nameof(DateTimeAttribute)))                 Add(typeof(DateTimeAttribute));
-      if (!Contains(nameof(FileListAttribute)))                 Add(typeof(FileListAttribute));
-      if (!Contains(nameof(FilePathAttribute)))                 Add(typeof(FilePathAttribute));
-      if (!Contains(nameof(HtmlAttribute)))                     Add(typeof(HtmlAttribute));
-      if (!Contains(nameof(LastModifiedAttribute)))             Add(typeof(LastModifiedAttribute));
-      if (!Contains(nameof(LastModifiedByAttribute)))           Add(typeof(LastModifiedByAttribute));
-      if (!Contains(nameof(NestedTopicListAttribute)))          Add(typeof(NestedTopicListAttribute));
-      if (!Contains(nameof(NumberAttribute)))                   Add(typeof(NumberAttribute));
-      if (!Contains(nameof(QueryableTopicListAttribute)))       Add(typeof(QueryableTopicListAttribute));
-      if (!Contains(nameof(RelationshipAttribute)))             Add(typeof(RelationshipAttribute));
-      if (!Contains(nameof(TextAreaAttribute)))                 Add(typeof(TextAreaAttribute));
-      if (!Contains(nameof(TextAttribute)))                     Add(typeof(TextAttribute));
-      if (!Contains(nameof(TokenizedTopicListAttribute)))       Add(typeof(TokenizedTopicListAttribute));
-      if (!Contains(nameof(TopicListAttribute)))                Add(typeof(TopicListAttribute));
-      if (!Contains(nameof(TopicReferenceAttribute)))           Add(typeof(TopicReferenceAttribute));
+      TryAdd(typeof(ContentTypeDescriptor));
+      TryAdd(typeof(AttributeDescriptor));
+      TryAdd(typeof(BooleanAttribute));
+      TryAdd(typeof(DateTimeAttribute));
+      TryAdd(typeof(FileListAttribute));
+      TryAdd(typeof(FilePathAttribute));
+      TryAdd(typeof(HtmlAttribute));
+      TryAdd(typeof(LastModifiedAttribute));
+      TryAdd(typeof(LastModifiedByAttribute));
+      TryAdd(typeof(NestedTopicListAttribute));
+      TryAdd(typeof(NumberAttribute));
+      TryAdd(typeof(QueryableTopicListAttribute));
+      TryAdd(typeof(RelationshipAttribute));
+      TryAdd(typeof(TextAreaAttribute));
+      TryAdd(typeof(TextAttribute));
+      TryAdd(typeof(TokenizedTopicListAttribute));
+      TryAdd(typeof(TopicListAttribute));
+      TryAdd(typeof(TopicReferenceAttribute));
 
     }
 

OnTopic/Reflection/DynamicTypeLookupService.cs

@@ -43,9 +43,7 @@ public DynamicTypeLookupService(Func<Type, bool> predicate, Type? defaultType =
       | Populate collection
       \-----------------------------------------------------------------------------------------------------------------------*/
       foreach (var type in matchedTypes) {
-        if (!Contains(type)) {
-          Add(type);
-        }
+        TryAdd(type);
       }
 
     }