Big merge from master plus a few fixes after merge

rappen · Jun 30, 2022 · cf47894 · cf47894
2 parents 2a7000c + 4362fe6
commit cf47894
Show file tree

Hide file tree

Showing 39 changed files with 93 additions and 118 deletions.
diff --git a/FXBEditorUtils/FindTextHandler.cs b/FXBEditorUtils/FindTextHandler.cs
@@ -1,5 +1,5 @@
-using System.Windows.Forms;
-using ScintillaNET;
+using ScintillaNET;
+using System.Windows.Forms;
 
 namespace Rappen.XTB.XmlEditorUtils
 {

diff --git a/FXBTests/Properties/AssemblyInfo.cs b/FXBTests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("FXBTests")]
@@ -10,11 +9,9 @@
 [assembly: AssemblyCopyright("Copyright ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
 [assembly: ComVisible(false)]
-
 [assembly: Guid("8f32ef58-ac53-49de-957b-102d78368377")]
 
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")] 
diff --git a/FetchXmlBuilder/AppCode/ScintillaHelper.cs b/FetchXmlBuilder/AppCode/ScintillaHelper.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
+using Rappen.XTB.FetchXmlBuilder.Settings;
+using ScintillaNET;
 using System.Drawing;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
-using Rappen.XTB.FetchXmlBuilder.Settings;
-using ScintillaNET;
 
 namespace Rappen.XTB.FetchXmlBuilder.AppCode
 {

diff --git a/FetchXmlBuilder/AppCode/WebAPIMetadataProvider.cs b/FetchXmlBuilder/AppCode/WebAPIMetadataProvider.cs
@@ -1,6 +1,6 @@
-using System;
-using MarkMpn.FetchXmlToWebAPI;
+using MarkMpn.FetchXmlToWebAPI;
 using Microsoft.Xrm.Sdk.Metadata;
+using System;
 
 namespace Rappen.XTB.FetchXmlBuilder.AppCode
 {

diff --git a/FetchXmlBuilder/Builder/FetchNodeCapabilities.cs b/FetchXmlBuilder/Builder/FetchNodeCapabilities.cs
@@ -1,6 +1,4 @@
-using Rappen.XTB.XmlEditorUtils;
-using System.Collections.Generic;
-using System.Windows.Forms;
+using System.Collections.Generic;
 
 namespace Rappen.XTB.FetchXmlBuilder.Builder
 {

diff --git a/FetchXmlBuilder/Builder/TreeNodeExtensions.cs b/FetchXmlBuilder/Builder/TreeNodeExtensions.cs
@@ -5,7 +5,7 @@
 
 namespace Rappen.XTB.FetchXmlBuilder.Builder
 {
-    internal static class TreeNodeExtensions
+    public static class TreeNodeExtensions
     {
         internal static TreeNode LocalEntityNode(this TreeNode node)
         {
@@ -21,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,10 @@
-using Rappen.XTB.FetchXmlBuilder.AppCode;
-using Rappen.XTB.FetchXmlBuilder.Controls;
+using Rappen.XTB.FetchXmlBuilder.Controls;
 using Rappen.XTB.FetchXmlBuilder.DockControls;
 using Rappen.XTB.FetchXmlBuilder.Settings;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using System.Xml;
-using System.Xml.Linq;
 
 namespace Rappen.XTB.FetchXmlBuilder.Builder
 {

diff --git a/FetchXmlBuilder/Builder/Validations.cs b/FetchXmlBuilder/Builder/Validations.cs
@@ -1,6 +1,5 @@
-using Rappen.XTB.FetchXmlBuilder.AppCode;
+using Microsoft.Xrm.Sdk.Metadata;
 using Rappen.XTB.FetchXmlBuilder.Controls;
-using Microsoft.Xrm.Sdk.Metadata;
 using System.Linq;
 using System.Windows.Forms;
 

diff --git a/FetchXmlBuilder/Controls/FetchXmlElementControlBase.cs b/FetchXmlBuilder/Controls/FetchXmlElementControlBase.cs
@@ -1,6 +1,6 @@
-using Rappen.XTB.FetchXmlBuilder.DockControls;
+using Microsoft.Xrm.Sdk.Metadata;
+using Rappen.XTB.FetchXmlBuilder.DockControls;
 using Rappen.XTB.XmlEditorUtils;
-using Microsoft.Xrm.Sdk.Metadata;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

diff --git a/FetchXmlBuilder/Controls/attributeControl.cs b/FetchXmlBuilder/Controls/attributeControl.cs
@@ -1,9 +1,8 @@
-using Rappen.XTB.FetchXmlBuilder.AppCode;
+using Microsoft.Xrm.Sdk.Metadata;
 using Rappen.XTB.FetchXmlBuilder.Builder;
 using Rappen.XTB.FetchXmlBuilder.ControlsClasses;
 using Rappen.XTB.FetchXmlBuilder.DockControls;
 using Rappen.XTB.FetchXmlBuilder.Views;
-using Microsoft.Xrm.Sdk.Metadata;
 using System;
 using System.Linq;
 using System.Windows.Forms;

diff --git a/FetchXmlBuilder/Controls/conditionControl.cs b/FetchXmlBuilder/Controls/conditionControl.cs
@@ -1,11 +1,11 @@
-using Rappen.XTB.FetchXmlBuilder.Builder;
+using Microsoft.Xrm.Sdk;
+using Microsoft.Xrm.Sdk.Metadata;
+using Microsoft.Xrm.Sdk.Query;
+using Rappen.XTB.FetchXmlBuilder.Builder;
 using Rappen.XTB.FetchXmlBuilder.ControlsClasses;
 using Rappen.XTB.FetchXmlBuilder.DockControls;
 using Rappen.XTB.FetchXmlBuilder.Extensions;
 using Rappen.XTB.XmlEditorUtils;
-using Microsoft.Xrm.Sdk;
-using Microsoft.Xrm.Sdk.Metadata;
-using Microsoft.Xrm.Sdk.Query;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

diff --git a/FetchXmlBuilder/Controls/entityControl.cs b/FetchXmlBuilder/Controls/entityControl.cs
@@ -1,6 +1,6 @@
-using Rappen.XTB.FetchXmlBuilder.ControlsClasses;
+using Microsoft.Xrm.Sdk.Metadata;
+using Rappen.XTB.FetchXmlBuilder.ControlsClasses;
 using Rappen.XTB.FetchXmlBuilder.DockControls;
-using Microsoft.Xrm.Sdk.Metadata;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;

diff --git a/FetchXmlBuilder/Controls/linkEntityControl.cs b/FetchXmlBuilder/Controls/linkEntityControl.cs
@@ -1,9 +1,8 @@
-using Rappen.XTB.FetchXmlBuilder.AppCode;
+using Microsoft.Xrm.Sdk;
+using Microsoft.Xrm.Sdk.Metadata;
 using Rappen.XTB.FetchXmlBuilder.Builder;
 using Rappen.XTB.FetchXmlBuilder.ControlsClasses;
 using Rappen.XTB.FetchXmlBuilder.DockControls;
-using Microsoft.Xrm.Sdk;
-using Microsoft.Xrm.Sdk.Metadata;
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/FetchXmlBuilder/Controls/orderControl.cs b/FetchXmlBuilder/Controls/orderControl.cs
@@ -1,8 +1,7 @@
-using Rappen.XTB.FetchXmlBuilder.AppCode;
+using Microsoft.Xrm.Sdk.Metadata;
 using Rappen.XTB.FetchXmlBuilder.Builder;
 using Rappen.XTB.FetchXmlBuilder.ControlsClasses;
 using Rappen.XTB.FetchXmlBuilder.DockControls;
-using Microsoft.Xrm.Sdk.Metadata;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;

diff --git a/FetchXmlBuilder/Controls/valueControl.cs b/FetchXmlBuilder/Controls/valueControl.cs
@@ -1,7 +1,7 @@
-using Rappen.XTB.FetchXmlBuilder.Builder;
+using Microsoft.Xrm.Sdk.Metadata;
+using Rappen.XTB.FetchXmlBuilder.Builder;
 using Rappen.XTB.FetchXmlBuilder.ControlsClasses;
 using Rappen.XTB.FetchXmlBuilder.DockControls;
-using Microsoft.Xrm.Sdk.Metadata;
 using System;
 using System.Linq;
 using System.Windows.Forms;

diff --git a/FetchXmlBuilder/ControlsClasses/AttributeItem.cs b/FetchXmlBuilder/ControlsClasses/AttributeItem.cs
@@ -1,5 +1,5 @@
-using Rappen.XTB.XmlEditorUtils;
-using Microsoft.Xrm.Sdk.Metadata;
+using Microsoft.Xrm.Sdk.Metadata;
+using Rappen.XTB.XmlEditorUtils;
 using System.Windows.Forms;
 
 namespace Rappen.XTB.FetchXmlBuilder.ControlsClasses

diff --git a/FetchXmlBuilder/ControlsClasses/EntityItem.cs b/FetchXmlBuilder/ControlsClasses/EntityItem.cs
@@ -1,5 +1,5 @@
-using Rappen.XTB.XmlEditorUtils;
-using Microsoft.Xrm.Sdk.Metadata;
+using Microsoft.Xrm.Sdk.Metadata;
+using Rappen.XTB.XmlEditorUtils;
 
 namespace Rappen.XTB.FetchXmlBuilder.ControlsClasses
 {

diff --git a/FetchXmlBuilder/ControlsClasses/EntityNameItem.cs b/FetchXmlBuilder/ControlsClasses/EntityNameItem.cs
@@ -1,5 +1,5 @@
-using Rappen.XTB.XmlEditorUtils;
-using Microsoft.Xrm.Sdk.Metadata;
+using Microsoft.Xrm.Sdk.Metadata;
+using Rappen.XTB.XmlEditorUtils;
 
 namespace Rappen.XTB.FetchXmlBuilder.ControlsClasses
 {

diff --git a/FetchXmlBuilder/ControlsClasses/EntityNode.cs b/FetchXmlBuilder/ControlsClasses/EntityNode.cs
@@ -1,5 +1,4 @@
-using Rappen.XTB.FetchXmlBuilder.AppCode;
-using Rappen.XTB.FetchXmlBuilder.Builder;
+using Rappen.XTB.FetchXmlBuilder.Builder;
 using System.Windows.Forms;
 
 namespace Rappen.XTB.FetchXmlBuilder.ControlsClasses

diff --git a/FetchXmlBuilder/ControlsClasses/EntityRelationship.cs b/FetchXmlBuilder/ControlsClasses/EntityRelationship.cs
@@ -1,7 +1,6 @@
 using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Metadata;
 using System;
-using System.Linq;
 
 namespace Rappen.XTB.FetchXmlBuilder.ControlsClasses
 {

diff --git a/FetchXmlBuilder/ControlsClasses/OperatorItem.cs b/FetchXmlBuilder/ControlsClasses/OperatorItem.cs
@@ -1,6 +1,6 @@
-using Rappen.XTB.XmlEditorUtils;
-using Microsoft.Xrm.Sdk.Metadata;
+using Microsoft.Xrm.Sdk.Metadata;
 using Microsoft.Xrm.Sdk.Query;
+using Rappen.XTB.XmlEditorUtils;
 using System.Collections.Generic;
 
 namespace Rappen.XTB.FetchXmlBuilder.ControlsClasses

diff --git a/FetchXmlBuilder/ControlsClasses/OptionsetItem.cs b/FetchXmlBuilder/ControlsClasses/OptionsetItem.cs
@@ -1,5 +1,5 @@
-using Rappen.XTB.XmlEditorUtils;
-using Microsoft.Xrm.Sdk.Metadata;
+using Microsoft.Xrm.Sdk.Metadata;
+using Rappen.XTB.XmlEditorUtils;
 
 namespace Rappen.XTB.FetchXmlBuilder.ControlsClasses
 {

diff --git a/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs b/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Security;
 using System.Text;

diff --git a/FetchXmlBuilder/Converters/JavascriptCodeGenerator.cs b/FetchXmlBuilder/Converters/JavascriptCodeGenerator.cs
@@ -1,9 +1,8 @@
-using System;
+using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security;
 using System.Xml;
-using Newtonsoft.Json;
 
 namespace Rappen.XTB.FetchXmlBuilder.Converters
 {

diff --git a/FetchXmlBuilder/Converters/QueryExpressionCodeGenerator.cs b/FetchXmlBuilder/Converters/QueryExpressionCodeGenerator.cs
@@ -1,13 +1,12 @@
-using Microsoft.Xrm.Sdk;
+using Microsoft.CSharp;
+using Microsoft.Xrm.Sdk;
 using Microsoft.Xrm.Sdk.Query;
+using Rappen.XTB.FetchXmlBuilder.Extensions;
 using System;
+using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.Text;
-using Microsoft.CSharp;
-using System.CodeDom.Compiler;
 using System.Text.RegularExpressions;
-using Microsoft.Crm.Sdk.Messages;
-using Rappen.XTB.FetchXmlBuilder.Extensions;
 
 namespace Rappen.XTB.FetchXmlBuilder.Converters
 {

diff --git a/FetchXmlBuilder/DockControls/ResultGrid.cs b/FetchXmlBuilder/DockControls/ResultGrid.cs
@@ -1,8 +1,7 @@
-using Rappen.XTB.FetchXmlBuilder.AppCode;
+using Microsoft.Xrm.Sdk;
+using Rappen.XTB.FetchXmlBuilder.AppCode;
 using Rappen.XTB.FetchXmlBuilder.Extensions;
-using Microsoft.Xrm.Sdk;
 using System;
-using System.Diagnostics;
 using System.Windows.Forms;
 
 namespace Rappen.XTB.FetchXmlBuilder.DockControls

diff --git a/FetchXmlBuilder/DockControls/TreeBuilderControl.cs b/FetchXmlBuilder/DockControls/TreeBuilderControl.cs
@@ -1,13 +1,13 @@
-using Rappen.XTB.FetchXmlBuilder.AppCode;
+using Microsoft.Crm.Sdk.Messages;
+using Microsoft.Xrm.Sdk.Metadata;
+using Microsoft.Xrm.Sdk.Query;
+using Rappen.XTB.FetchXmlBuilder.AppCode;
 using Rappen.XTB.FetchXmlBuilder.Builder;
 using Rappen.XTB.FetchXmlBuilder.Controls;
 using Rappen.XTB.FetchXmlBuilder.Extensions;
 using Rappen.XTB.FetchXmlBuilder.Forms;
 using Rappen.XTB.FetchXmlBuilder.Views;
 using Rappen.XTB.XmlEditorUtils;
-using Microsoft.Crm.Sdk.Messages;
-using Microsoft.Xrm.Sdk.Metadata;
-using Microsoft.Xrm.Sdk.Query;
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/FetchXmlBuilder/DockControls/XmlContentControl.cs b/FetchXmlBuilder/DockControls/XmlContentControl.cs
@@ -1,10 +1,10 @@
-using Rappen.XTB.FetchXmlBuilder.AppCode;
+using MarkMpn.XmlSchemaAutocomplete.Scintilla;
+using Microsoft.Xrm.Sdk.Metadata;
+using Rappen.XRM.Helpers.Extensions;
+using Rappen.XTB.FetchXmlBuilder.AppCode;
 using Rappen.XTB.FetchXmlBuilder.Extensions;
 using Rappen.XTB.FetchXmlBuilder.Settings;
 using Rappen.XTB.XmlEditorUtils;
-using MarkMpn.XmlSchemaAutocomplete.Scintilla;
-using Microsoft.Xrm.Sdk.Metadata;
-using Rappen.XRM.Helpers.Extensions;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -39,7 +39,7 @@ internal XmlContentControl(ContentType contentType, SaveFormat saveFormat, Fetch
             SetContentType(contentType);
             SetFormat(saveFormat);
             UpdateButtons();
-            if (contentType == ContentType.FetchXML || contentType == ContentType.LayoutXML)
+            if (contentType == ContentType.FetchXML)
             {
                 InitIntellisense();
             }
@@ -78,7 +78,6 @@ internal void SetContentType(ContentType contentType)
             switch (contentType)
             {
                 case ContentType.FetchXML:
-                case ContentType.LayoutXML:
                 case ContentType.FetchXML_Result:
                 case ContentType.Serialized_Result_XML:
                     txtXML.ConfigureForXml(fxb.settings);
@@ -782,14 +781,14 @@ private void txtXML_KeyUp(object sender, KeyEventArgs e)
     public enum ContentType
     {
         FetchXML,
+        LayoutXML,
         FetchXML_Result,
         Serialized_Result_XML,
         Serialized_Result_JSON,
         QueryExpression,
         SQL_Query,
         JavaScript_Query,
-        CSharp_Query,
-        LayoutXML
+        CSharp_Query
     }
 
     internal enum SaveFormat

diff --git a/FetchXmlBuilder/FXBGui.cs b/FetchXmlBuilder/FXBGui.cs
@@ -1,14 +1,14 @@
-using Rappen.XTB.FetchXmlBuilder.AppCode;
+using Microsoft.Crm.Sdk.Messages;
+using Microsoft.Xrm.Sdk;
+using Microsoft.Xrm.Sdk.Metadata;
+using Rappen.XTB.FetchXmlBuilder.AppCode;
 using Rappen.XTB.FetchXmlBuilder.Converters;
 using Rappen.XTB.FetchXmlBuilder.DockControls;
 using Rappen.XTB.FetchXmlBuilder.Extensions;
 using Rappen.XTB.FetchXmlBuilder.Forms;
 using Rappen.XTB.FetchXmlBuilder.Settings;
 using Rappen.XTB.FetchXmlBuilder.Views;
 using Rappen.XTB.XmlEditorUtils;
-using Microsoft.Crm.Sdk.Messages;
-using Microsoft.Xrm.Sdk;
-using Microsoft.Xrm.Sdk.Metadata;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -47,7 +47,6 @@ public partial class FetchXmlBuilder : PluginControlBase
         private bool bduexists;
 
         internal void EnableControls()
-
         {
             EnableControls(buttonsEnabled);
         }