From a9290db99457516392b71cdaca53504ed4f1122b Mon Sep 17 00:00:00 2001
From: Meindert Niemeijer <meindertn@gmail.com>
Date: Fri, 22 Mar 2024 14:21:14 -0500
Subject: [PATCH] finished cleanup after 1.3.1 merge

---
 RoboClerk.OpenAI/OpenAIPlugin.cs          | 1 +
 RoboClerk.OpenAI/OpenAIPromptTemplate.cs  | 1 +
 RoboClerk.Tests/TestPromptTemplate.cs     | 1 +
 RoboClerk/AISystem/AISystemPluginBase.cs  | 5 ++---
 RoboClerk/AISystem/PromptTemplate.cs      | 2 +-
 RoboClerk/Document.cs                     | 2 +-
 RoboClerk/PluginSupport/SLMSPluginBase.cs | 2 +-
 RoboClerk/RoboClerkTag.cs                 | 4 ++--
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/RoboClerk.OpenAI/OpenAIPlugin.cs b/RoboClerk.OpenAI/OpenAIPlugin.cs
index cf08ae2..415d41b 100644
--- a/RoboClerk.OpenAI/OpenAIPlugin.cs
+++ b/RoboClerk.OpenAI/OpenAIPlugin.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO.Abstractions;
+using RoboClerk.AISystem;
 
 namespace RoboClerk.OpenAI
 {
diff --git a/RoboClerk.OpenAI/OpenAIPromptTemplate.cs b/RoboClerk.OpenAI/OpenAIPromptTemplate.cs
index f95e6f8..ce45f69 100644
--- a/RoboClerk.OpenAI/OpenAIPromptTemplate.cs
+++ b/RoboClerk.OpenAI/OpenAIPromptTemplate.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using RoboClerk.AISystem;
 using Tomlet;
 
 namespace RoboClerk
diff --git a/RoboClerk.Tests/TestPromptTemplate.cs b/RoboClerk.Tests/TestPromptTemplate.cs
index b73ea68..1496d39 100644
--- a/RoboClerk.Tests/TestPromptTemplate.cs
+++ b/RoboClerk.Tests/TestPromptTemplate.cs
@@ -1,6 +1,7 @@
 using NSubstitute;
 using NUnit.Framework;
 using System.Collections.Generic;
+using RoboClerk.AISystem;
 
 namespace RoboClerk.Tests
 {
diff --git a/RoboClerk/AISystem/AISystemPluginBase.cs b/RoboClerk/AISystem/AISystemPluginBase.cs
index a885eff..db4b9d1 100644
--- a/RoboClerk/AISystem/AISystemPluginBase.cs
+++ b/RoboClerk/AISystem/AISystemPluginBase.cs
@@ -1,9 +1,8 @@
-using RoboClerk.AISystem;
-using RoboClerk.Configuration;
+using RoboClerk.Configuration;
 using System.Collections.Generic;
 using System.IO.Abstractions;
 
-namespace RoboClerk
+namespace RoboClerk.AISystem
 {
     public abstract class AISystemPluginBase : PluginBase, IAISystemPlugin
     {
diff --git a/RoboClerk/AISystem/PromptTemplate.cs b/RoboClerk/AISystem/PromptTemplate.cs
index bbd52b0..ace62fd 100644
--- a/RoboClerk/AISystem/PromptTemplate.cs
+++ b/RoboClerk/AISystem/PromptTemplate.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Reflection;
 
-namespace RoboClerk
+namespace RoboClerk.AISystem
 {
     public class PromptTemplate
     {
diff --git a/RoboClerk/Document.cs b/RoboClerk/Document.cs
index 2069240..d19113c 100644
--- a/RoboClerk/Document.cs
+++ b/RoboClerk/Document.cs
@@ -32,7 +32,7 @@ public void FromString(string text)
             catch (TagInvalidException e)
             {
                 e.DocumentTitle = title;
-                throw e;
+                throw;
             }
         }
 
diff --git a/RoboClerk/PluginSupport/SLMSPluginBase.cs b/RoboClerk/PluginSupport/SLMSPluginBase.cs
index 0b4effa..67f88b8 100644
--- a/RoboClerk/PluginSupport/SLMSPluginBase.cs
+++ b/RoboClerk/PluginSupport/SLMSPluginBase.cs
@@ -6,7 +6,7 @@
 
 namespace RoboClerk
 {
-    public abstract class SLMSPluginBase : PluginBase
+    public abstract class SLMSPluginBase : DataSourcePluginBase
     {
         protected string prsName = string.Empty;
         protected string srsName = string.Empty;
diff --git a/RoboClerk/RoboClerkTag.cs b/RoboClerk/RoboClerkTag.cs
index 899d58d..0027eb5 100644
--- a/RoboClerk/RoboClerkTag.cs
+++ b/RoboClerk/RoboClerkTag.cs
@@ -183,7 +183,7 @@ private void ProcessRoboClerkContainerInlineTag(int startIndex, int endIndex, st
             catch (TagInvalidException e)
             {
                 e.SetLocation(tagStart, rawDocument);
-                throw e;
+                throw;
             }
             ExtractParameters(contents);
             var items = contents.Split('(')[0].Split(':');
@@ -248,7 +248,7 @@ private void ProcessRoboClerkContainerTag(int startIndex, int endIndex, string r
             catch (TagInvalidException e)
             {
                 e.SetLocation(tagStart, rawDocument);
-                throw e;
+                throw;
             }
             var items = tagContents.Split(':');
             source = GetSource(items[0].Trim().ToUpper());