Restructuring namespaces

rappen · Jun 30, 2022 · 8d84a02 · 8d84a02
1 parent 175efb2
commit 8d84a02
Show file tree

Hide file tree

Showing 52 changed files with 151 additions and 102 deletions.
diff --git a/FXBTests/QueryExpressionTests.cs b/FXBTests/QueryExpressionTests.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Cinteros.Xrm.FetchXmlBuilder.AppCode;
+using Cinteros.Xrm.FetchXmlBuilder.Converters;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.Xrm.Sdk.Query;
 

diff --git a/FetchXmlBuilder/AppCode/FXBMessageBusArgument.cs b/FetchXmlBuilder/AppCode/FXBMessageBusArgument.cs
@@ -1,6 +1,6 @@
 using Microsoft.Xrm.Sdk.Query;
 
-namespace Cinteros.Xrm.FetchXmlBuilder
+namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
 {
     public class FXBMessageBusArgument
     {

diff --git a/FetchXmlBuilder/AppCode/HistoryManager.cs b/FetchXmlBuilder/AppCode/HistoryManager.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 
-namespace Cinteros.Xrm.FetchXmlBuilder
+namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
 {
     public class HistoryManager
     {

diff --git a/FetchXmlBuilder/AppCode/ScintillaHelper.cs b/FetchXmlBuilder/AppCode/ScintillaHelper.cs
@@ -1,17 +1,12 @@
-using System;
-using System.Collections.Generic;
+using Cinteros.Xrm.FetchXmlBuilder.Settings;
+using ScintillaNET;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
-using Cinteros.Xrm.FetchXmlBuilder.AppCode;
-using ScintillaNET;
 
-namespace Cinteros.Xrm.FetchXmlBuilder
+namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
 {
-    static class ScintillaHelper
+    internal static class ScintillaHelper
     {
         public static void ConfigureForXml(this Scintilla scintilla, FXBSettings settings)
         {
@@ -247,4 +242,4 @@ public static void FormatXML(this Scintilla scintilla, string text, FXBSettings
             }
         }
     }
-}
+}
diff --git a/FetchXmlBuilder/AppCode/Utils.cs b/FetchXmlBuilder/AppCode/Utils.cs
@@ -28,4 +28,4 @@ public static string ProcessURL(string url)
             return urib.Uri.ToString();
         }
     }
-}
+}
diff --git a/FetchXmlBuilder/AppCode/WebAPIMetadataProvider.cs b/FetchXmlBuilder/AppCode/WebAPIMetadataProvider.cs
@@ -2,7 +2,7 @@
 using MarkMpn.FetchXmlToWebAPI;
 using Microsoft.Xrm.Sdk.Metadata;
 
-namespace Cinteros.Xrm.FetchXmlBuilder
+namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
 {
     internal class WebAPIMetadataProvider : IMetadataProvider
     {

diff --git a/FetchXmlBuilder/Builder/FetchIsAggregateException.cs b/FetchXmlBuilder/Builder/FetchIsAggregateException.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
+namespace Cinteros.Xrm.FetchXmlBuilder.Builder
 {
     internal class FetchIsAggregateException : Exception
     {

diff --git a/FetchXmlBuilder/Builder/FetchNodeCapabilities.cs b/FetchXmlBuilder/Builder/FetchNodeCapabilities.cs
@@ -1,8 +1,6 @@
-using Cinteros.Xrm.XmlEditorUtils;
-using System.Collections.Generic;
-using System.Windows.Forms;
+using System.Collections.Generic;
 
-namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
+namespace Cinteros.Xrm.FetchXmlBuilder.Builder
 {
     public class FetchNodeCapabilities
     {
@@ -32,22 +30,27 @@ private FetchNodeCapabilities(string name)
                     Delete = false;
                     Comment = false;
                     break;
+
                 case "entity":
                     Multiple = false;
                     Attributes = true;
                     break;
+
                 case "link-entity":
                     Attributes = true;
                     break;
+
                 case "all-attributes":
                     Multiple = false;
                     break;
+
                 case "attribute":
                 case "order":
                 case "filter":
                 case "condition":
                 case "value":
                     break;
+
                 case "#comment":
                     Comment = false;
                     Uncomment = true;
@@ -65,6 +68,7 @@ private void AddChildren()
                     ChildTypes.Add(new FetchNodeCapabilities("-"));
                     ChildTypes.Add(new FetchNodeCapabilities("#comment"));
                     break;
+
                 case "entity":
                 case "link-entity":
                     ChildTypes.Add(new FetchNodeCapabilities("-"));
@@ -76,25 +80,30 @@ private void AddChildren()
                     ChildTypes.Add(new FetchNodeCapabilities("-"));
                     ChildTypes.Add(new FetchNodeCapabilities("#comment"));
                     break;
+
                 case "all-attributes":
                 case "attribute":
                 case "order":
                     ChildTypes.Add(new FetchNodeCapabilities("#comment"));
                     break;
+
                 case "filter":
                     ChildTypes.Add(new FetchNodeCapabilities("condition"));
                     ChildTypes.Add(new FetchNodeCapabilities("filter"));
                     ChildTypes.Add(new FetchNodeCapabilities("-"));
                     ChildTypes.Add(new FetchNodeCapabilities("#comment"));
                     break;
+
                 case "condition":
                     ChildTypes.Add(new FetchNodeCapabilities("value"));
                     ChildTypes.Add(new FetchNodeCapabilities("-"));
                     ChildTypes.Add(new FetchNodeCapabilities("#comment"));
                     break;
+
                 case "value":
                     ChildTypes.Add(new FetchNodeCapabilities("#comment"));
                     break;
+
                 case "#comment":
                     break;
             }

diff --git a/FetchXmlBuilder/Builder/TreeNodeExtensions.cs b/FetchXmlBuilder/Builder/TreeNodeExtensions.cs
@@ -1,14 +1,9 @@
-using Cinteros.Xrm.FetchXmlBuilder.AppCode;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using System.Windows.Forms;
 using System.Xml;
 using System.Xml.Linq;
 
-namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
+namespace Cinteros.Xrm.FetchXmlBuilder.Builder
 {
     public static class TreeNodeExtensions
     {
@@ -26,17 +21,17 @@ internal static TreeNode LocalEntityNode(this TreeNode node)
                     return null;
                 }
             }
-            return (node.Name.Equals("entity") || node.Name.Equals("link-entity")) ? node : null;
+            return node.Name.Equals("entity") || node.Name.Equals("link-entity") ? node : null;
         }
 
         internal static bool LocalEntityIsRoot(this TreeNode node)
         {
-            return LocalEntityNode(node)?.Name == "entity";
+            return node.LocalEntityNode()?.Name == "entity";
         }
 
         internal static string LocalEntityName(this TreeNode node)
         {
-            return LocalEntityNode(node).Value("name");
+            return node.LocalEntityNode().Value("name");
         }
 
         internal static string Value(this TreeNode node, string key)

diff --git a/FetchXmlBuilder/Builder/TreeNodeHelper.cs b/FetchXmlBuilder/Builder/TreeNodeHelper.cs
@@ -1,13 +1,12 @@
 using Cinteros.Xrm.FetchXmlBuilder.Controls;
 using Cinteros.Xrm.FetchXmlBuilder.DockControls;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using System.Xml;
-using System.Xml.Linq;
+using Cinteros.Xrm.FetchXmlBuilder.Settings;
 
-namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
+namespace Cinteros.Xrm.FetchXmlBuilder.Builder
 {
     internal class TreeNodeHelper
     {
@@ -83,7 +82,7 @@ public static TreeNode AddTreeViewNode(TreeNode parentnode, TreeNode node, XmlNo
                     if (node.Text != originalText ||
                         node.Name != originalName ||
                         originalAttributes == null ||
-                        String.Join(";", attributes.OrderBy(kvp => kvp.Key).Select(kvp => kvp.Key + "=" + kvp.Value)) != String.Join(";", originalAttributes.OrderBy(kvp => kvp.Key).Select(kvp => kvp.Key + "=" + kvp.Value)))
+                        string.Join(";", attributes.OrderBy(kvp => kvp.Key).Select(kvp => kvp.Key + "=" + kvp.Value)) != string.Join(";", originalAttributes.OrderBy(kvp => kvp.Key).Select(kvp => kvp.Key + "=" + kvp.Value)))
                     {
                         node.TreeView.SelectedNode = null;
                         node.TreeView.SelectedNode = node;
@@ -146,6 +145,7 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                         text = "fetch";
                     }
                     break;
+
                 case "entity":
                 case "link-entity":
                     text += " " + fxb.GetEntityDisplayName(name);
@@ -158,6 +158,7 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                         text += " M:M";
                     }
                     break;
+
                 case "attribute":
                     if (!string.IsNullOrEmpty(name))
                     {
@@ -190,6 +191,7 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                         }
                     }
                     break;
+
                 case "filter":
                     var type = node.Value("type");
                     if (string.IsNullOrEmpty(type))
@@ -198,6 +200,7 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                     }
                     text += " " + type;
                     break;
+
                 case "condition":
                     {
                         var ent = node.Value("entityname");
@@ -232,10 +235,12 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                         text += (" " + attr + " " + oper + " " + val).TrimEnd();
                     }
                     break;
+
                 case "value":
                     var value = node.Value("#text");
                     text += " " + value;
                     break;
+
                 case "order":
                     {
                         var attr = node.Value("attribute");
@@ -261,6 +266,7 @@ public static void SetNodeText(TreeNode node, FetchXmlBuilder fxb, bool validate
                         }
                     }
                     break;
+
                 case "#comment":
                     text = node.Value("#comment")
                         .Trim()
@@ -313,9 +319,11 @@ private static void SetWarnings(TreeNode node, FetchXmlBuilder fxb)
                     case ControlValidationLevel.Error:
                         node.ImageKey = "error";
                         break;
+
                     case ControlValidationLevel.Warning:
                         node.ImageKey = "warning";
                         break;
+
                     case ControlValidationLevel.Info:
                         node.ImageKey = "info";
                         break;

diff --git a/FetchXmlBuilder/Builder/Validations.cs b/FetchXmlBuilder/Builder/Validations.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 
-namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
+namespace Cinteros.Xrm.FetchXmlBuilder.Builder
 {
     internal static class Validations
     {

diff --git a/FetchXmlBuilder/Controls/attributeControl.cs b/FetchXmlBuilder/Controls/attributeControl.cs
@@ -1,4 +1,5 @@
-using Cinteros.Xrm.FetchXmlBuilder.AppCode;
+using Cinteros.Xrm.FetchXmlBuilder.Builder;
+using Cinteros.Xrm.FetchXmlBuilder.ControlsClasses;
 using Cinteros.Xrm.FetchXmlBuilder.DockControls;
 using Microsoft.Xrm.Sdk.Metadata;
 using System;

diff --git a/FetchXmlBuilder/Controls/conditionControl.cs b/FetchXmlBuilder/Controls/conditionControl.cs
@@ -1,4 +1,5 @@
-using Cinteros.Xrm.FetchXmlBuilder.AppCode;
+using Cinteros.Xrm.FetchXmlBuilder.Builder;
+using Cinteros.Xrm.FetchXmlBuilder.ControlsClasses;
 using Cinteros.Xrm.FetchXmlBuilder.DockControls;
 using Cinteros.Xrm.XmlEditorUtils;
 using Microsoft.Xrm.Sdk;
@@ -10,6 +11,7 @@
 using System.Linq;
 using System.ServiceModel;
 using System.Windows.Forms;
+using Cinteros.Xrm.FetchXmlBuilder.Extensions;
 
 namespace Cinteros.Xrm.FetchXmlBuilder.Controls
 {

diff --git a/FetchXmlBuilder/Controls/entityControl.cs b/FetchXmlBuilder/Controls/entityControl.cs
@@ -1,4 +1,4 @@
-using Cinteros.Xrm.FetchXmlBuilder.AppCode;
+using Cinteros.Xrm.FetchXmlBuilder.ControlsClasses;
 using Cinteros.Xrm.FetchXmlBuilder.DockControls;
 using Microsoft.Xrm.Sdk.Metadata;
 using System.Collections.Generic;

diff --git a/FetchXmlBuilder/Controls/linkEntityControl.cs b/FetchXmlBuilder/Controls/linkEntityControl.cs
@@ -1,4 +1,5 @@
-using Cinteros.Xrm.FetchXmlBuilder.AppCode;
+using Cinteros.Xrm.FetchXmlBuilder.Builder;
+using Cinteros.Xrm.FetchXmlBuilder.ControlsClasses;
 using Cinteros.Xrm.FetchXmlBuilder.DockControls;
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Metadata;

diff --git a/FetchXmlBuilder/Controls/orderControl.cs b/FetchXmlBuilder/Controls/orderControl.cs
@@ -1,4 +1,5 @@
-using Cinteros.Xrm.FetchXmlBuilder.AppCode;
+using Cinteros.Xrm.FetchXmlBuilder.Builder;
+using Cinteros.Xrm.FetchXmlBuilder.ControlsClasses;
 using Cinteros.Xrm.FetchXmlBuilder.DockControls;
 using Microsoft.Xrm.Sdk.Metadata;
 using System.Collections.Generic;

diff --git a/FetchXmlBuilder/Controls/valueControl.cs b/FetchXmlBuilder/Controls/valueControl.cs
@@ -1,4 +1,5 @@
-using Cinteros.Xrm.FetchXmlBuilder.AppCode;
+using Cinteros.Xrm.FetchXmlBuilder.Builder;
+using Cinteros.Xrm.FetchXmlBuilder.ControlsClasses;
 using Cinteros.Xrm.FetchXmlBuilder.DockControls;
 using Microsoft.Xrm.Sdk.Metadata;
 using System;

diff --git a/FetchXmlBuilder/ControlsClasses/AttributeItem.cs b/FetchXmlBuilder/ControlsClasses/AttributeItem.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xrm.Sdk.Metadata;
 using System.Windows.Forms;
 
-namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
+namespace Cinteros.Xrm.FetchXmlBuilder.ControlsClasses
 {
     internal class AttributeItem : IComboBoxItem
     {

diff --git a/FetchXmlBuilder/ControlsClasses/EntityItem.cs b/FetchXmlBuilder/ControlsClasses/EntityItem.cs
@@ -1,7 +1,7 @@
 using Cinteros.Xrm.XmlEditorUtils;
 using Microsoft.Xrm.Sdk.Metadata;
 
-namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
+namespace Cinteros.Xrm.FetchXmlBuilder.ControlsClasses
 {
     public class EntityItem : IComboBoxItem
     {

diff --git a/FetchXmlBuilder/ControlsClasses/EntityNameItem.cs b/FetchXmlBuilder/ControlsClasses/EntityNameItem.cs
@@ -1,7 +1,7 @@
 using Cinteros.Xrm.XmlEditorUtils;
 using Microsoft.Xrm.Sdk.Metadata;
 
-namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
+namespace Cinteros.Xrm.FetchXmlBuilder.ControlsClasses
 {
     public class EntityNameItem : IComboBoxItem
     {

diff --git a/FetchXmlBuilder/ControlsClasses/EntityNode.cs b/FetchXmlBuilder/ControlsClasses/EntityNode.cs
@@ -1,7 +1,7 @@
-using Cinteros.Xrm.FetchXmlBuilder.AppCode;
+using Cinteros.Xrm.FetchXmlBuilder.Builder;
 using System.Windows.Forms;
 
-namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
+namespace Cinteros.Xrm.FetchXmlBuilder.ControlsClasses
 {
     public class EntityNode
     {

diff --git a/FetchXmlBuilder/ControlsClasses/EntityRelationship.cs b/FetchXmlBuilder/ControlsClasses/EntityRelationship.cs
@@ -1,9 +1,8 @@
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Metadata;
 using System;
-using System.Linq;
 
-namespace Cinteros.Xrm.FetchXmlBuilder.AppCode
+namespace Cinteros.Xrm.FetchXmlBuilder.ControlsClasses
 {
     public class EntityRelationship : IComparable
     {