Moved properties to FXBGui, FXBInterfaces, FBMetadata and `FXBQ…

…ueries`
rappen · Apr 24, 2022 · a6df981 · a6df981
1 parent 3097445
commit a6df981
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 26 deletions.
diff --git a/FetchXmlBuilder/FXBGui.cs b/FetchXmlBuilder/FXBGui.cs
@@ -19,6 +19,28 @@ namespace Cinteros.Xrm.FetchXmlBuilder
 {
     public partial class FetchXmlBuilder : PluginControlBase
     {
+        internal static bool friendlyNames = false;
+        internal TreeBuilderControl dockControlBuilder;
+        internal HistoryManager historyMgr = new HistoryManager();
+        internal bool historyisavailable = true;
+        private string cwpfeed;
+        private XmlContentControl dockControlFetchResult;
+        private XmlContentControl dockControlFetchXml;
+        private XmlContentControl dockControlFetchXmlCs;
+        private XmlContentControl dockControlFetchXmlJs;
+        private ResultGrid dockControlGrid;
+        private ODataControl dockControlOData2;
+        private ODataControl dockControlOData4;
+        private FlowListControl dockControlFlowList;
+        private XmlContentControl dockControlQExp;
+        private XmlContentControl dockControlSQL;
+        private MetadataControl dockControlMeta;
+        private Entity dynml;
+        private string fileName;
+        private QueryRepository repository = new QueryRepository();
+        private bool inSql4Cds;
+        private bool bduexists;
+
         internal void EnableControls()
         {
             EnableControls(buttonsEnabled);

diff --git a/FetchXmlBuilder/FXBInterfaces.cs b/FetchXmlBuilder/FXBInterfaces.cs
@@ -10,6 +10,8 @@ namespace Cinteros.Xrm.FetchXmlBuilder
 {
     public partial class FetchXmlBuilder : IGitHubPlugin, IPayPalPlugin, IMessageBusHost, IHelpPlugin, IStatusBarMessenger, IShortcutReceiver, IAboutPlugin, IDuplicatableTool, ISettingsPlugin
     {
+        private MessageBusEventArgs callerArgs = null;
+
         #region Public Events
 
         public event EventHandler<MessageBusEventArgs> OnOutgoingMessage;

diff --git a/FetchXmlBuilder/FXBMetadata.cs b/FetchXmlBuilder/FXBMetadata.cs
@@ -14,6 +14,9 @@ namespace Cinteros.Xrm.FetchXmlBuilder
 {
     public partial class FetchXmlBuilder
     {
+        internal Dictionary<string, EntityMetadata> entities;
+        private static List<string> entityShitList = new List<string>();
+
         #region Internal Methods
 
         internal AttributeMetadata GetAttribute(string entityName, string attributeName)

diff --git a/FetchXmlBuilder/FXBQueries.cs b/FetchXmlBuilder/FXBQueries.cs
@@ -15,6 +15,8 @@ namespace Cinteros.Xrm.FetchXmlBuilder
 {
     public partial class FetchXmlBuilder
     {
+        private string attributesChecksum = "";
+
         internal void FetchResults(string fetch = "")
         {
             if (!tsbExecute.Enabled)

diff --git a/FetchXmlBuilder/FetchXmlBuilder.cs b/FetchXmlBuilder/FetchXmlBuilder.cs
@@ -30,50 +30,27 @@ namespace Cinteros.Xrm.FetchXmlBuilder
 {
     public partial class FetchXmlBuilder : PluginControlBase
     {
+        #region AI to log
         private const string aiEndpoint = "https://dc.services.visualstudio.com/v2/track";
         private const string aiKey = "eed73022-2444-45fd-928b-5eebd8fa46a6";    // jonas@rappen.net tenant, XrmToolBox
         //private const string aiKey = "b6a4ec7c-ab43-4780-97cd-021e99506337";   // jonas@jonasr.app, XrmToolBoxInsights
+        private readonly AppInsights ai;
+        #endregion AI
 
         #region Internal Fields
 
-        internal Dictionary<string, EntityMetadata> entities;
-        internal static bool friendlyNames = false;
         internal Dictionary<string, List<Entity>> views;
         internal FXBSettings settings;
-        internal TreeBuilderControl dockControlBuilder;
         internal bool working = false;
         internal Version CDSVersion = new Version();
-        internal HistoryManager historyMgr = new HistoryManager();
-        internal bool historyisavailable = true;
 
         #endregion Internal Fields
 
         #region Private Fields
 
-        private static List<string> entityShitList = new List<string>();
-        private string attributesChecksum = "";
         private bool buttonsEnabled = true;
-        private MessageBusEventArgs callerArgs = null;
-        private string cwpfeed;
-        private XmlContentControl dockControlFetchResult;
-        private XmlContentControl dockControlFetchXml;
-        private XmlContentControl dockControlFetchXmlCs;
-        private XmlContentControl dockControlFetchXmlJs;
-        private ResultGrid dockControlGrid;
-        private ODataControl dockControlOData2;
-        private ODataControl dockControlOData4;
-        private FlowListControl dockControlFlowList;
-        private XmlContentControl dockControlQExp;
-        private XmlContentControl dockControlSQL;
-        private MetadataControl dockControlMeta;
-        private Entity dynml;
-        private string fileName;
         private int resultpanecount = 0;
         private Entity view;
-        private readonly AppInsights ai;
-        private QueryRepository repository = new QueryRepository();
-        private bool inSql4Cds;
-        private bool bduexists;
 
         #endregion Private Fields