From 8d84a028179f495c5d0eccd3c5069556729f0c09 Mon Sep 17 00:00:00 2001 From: Jonas Rapp Date: Thu, 30 Jun 2022 16:46:44 +0200 Subject: [PATCH] Restructuring namespaces --- FXBTests/QueryExpressionTests.cs | 2 +- .../AppCode/FXBMessageBusArgument.cs | 2 +- FetchXmlBuilder/AppCode/HistoryManager.cs | 2 +- FetchXmlBuilder/AppCode/ScintillaHelper.cs | 15 ++++-------- FetchXmlBuilder/AppCode/Utils.cs | 2 +- .../AppCode/WebAPIMetadataProvider.cs | 2 +- .../Builder/FetchIsAggregateException.cs | 2 +- .../Builder/FetchNodeCapabilities.cs | 17 ++++++++++---- FetchXmlBuilder/Builder/TreeNodeExtensions.cs | 15 ++++-------- FetchXmlBuilder/Builder/TreeNodeHelper.cs | 16 +++++++++---- FetchXmlBuilder/Builder/Validations.cs | 2 +- FetchXmlBuilder/Controls/attributeControl.cs | 3 ++- FetchXmlBuilder/Controls/conditionControl.cs | 4 +++- FetchXmlBuilder/Controls/entityControl.cs | 2 +- FetchXmlBuilder/Controls/linkEntityControl.cs | 3 ++- FetchXmlBuilder/Controls/orderControl.cs | 3 ++- FetchXmlBuilder/Controls/valueControl.cs | 3 ++- .../ControlsClasses/AttributeItem.cs | 2 +- FetchXmlBuilder/ControlsClasses/EntityItem.cs | 2 +- .../ControlsClasses/EntityNameItem.cs | 2 +- FetchXmlBuilder/ControlsClasses/EntityNode.cs | 4 ++-- .../ControlsClasses/EntityRelationship.cs | 3 +-- .../ControlsClasses/OperatorItem.cs | 14 +++++++---- .../ControlsClasses/OptionsetItem.cs | 2 +- .../Converters/CSharpCodeGenerator.cs | 4 ++-- .../Converters/JavascriptCodeGenerator.cs | 15 ++++++------ .../Converters/ODataCodeGenerator.cs | 2 +- .../QueryExpressionCodeGenerator.cs | 13 +++++------ .../Converters/SQLQueryGenerator.cs | 2 +- FetchXmlBuilder/DockControls/ResultGrid.cs | 2 ++ .../DockControls/TreeBuilderControl.cs | 4 +++- .../DockControls/XmlContentControl.cs | 3 +++ .../Extensions/ConnectionExtensions.cs | 5 ++-- FetchXmlBuilder/Extensions/DockExtensions.cs | 6 ++++- FetchXmlBuilder/Extensions/Extensions.cs | 2 +- .../Extensions/GroupBoxExpanderExtensions.cs | 4 ++-- .../Extensions/ServiceExtensions.cs | 2 +- FetchXmlBuilder/FXBGui.cs | 4 ++++ FetchXmlBuilder/FXBInterfaces.cs | 3 ++- FetchXmlBuilder/FXBMetadata.cs | 2 +- FetchXmlBuilder/FXBQueries.cs | 2 ++ FetchXmlBuilder/FetchXmlBuilder.cs | 6 ++++- FetchXmlBuilder/FetchXmlBuilder.csproj | 4 ++-- .../Forms/SelectAttributesDialog.cs | 2 +- FetchXmlBuilder/Forms/SelectMLDialog.cs | 1 + FetchXmlBuilder/Forms/SelectViewDialog.cs | 2 ++ FetchXmlBuilder/Forms/Settings.Designer.cs | 4 ++-- FetchXmlBuilder/Forms/Settings.cs | 1 + FetchXmlBuilder/Forms/ShowMetadataOptions.cs | 3 ++- .../Settings/FXBConnectionSettings.cs | 2 +- FetchXmlBuilder/Settings/FXBSettings.cs | 23 ++++++++++++------- FetchXmlBuilder/Views/ViewItem.cs | 6 ++--- 52 files changed, 151 insertions(+), 102 deletions(-) diff --git a/FXBTests/QueryExpressionTests.cs b/FXBTests/QueryExpressionTests.cs index 504736da..922fd2e9 100644 --- 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 index 388be288..9ae2e744 100644 --- 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 index 5a102bb2..15278204 100644 --- 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 index 88ebc4b5..ce427691 100644 --- 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 } } } -} +} \ No newline at end of file diff --git a/FetchXmlBuilder/AppCode/Utils.cs b/FetchXmlBuilder/AppCode/Utils.cs index 8f6f4e18..79af3e09 100644 --- a/FetchXmlBuilder/AppCode/Utils.cs +++ b/FetchXmlBuilder/AppCode/Utils.cs @@ -28,4 +28,4 @@ public static string ProcessURL(string url) return urib.Uri.ToString(); } } -} +} \ No newline at end of file diff --git a/FetchXmlBuilder/AppCode/WebAPIMetadataProvider.cs b/FetchXmlBuilder/AppCode/WebAPIMetadataProvider.cs index 557446f2..9fee41dd 100644 --- 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 index 408bc968..998c56d4 100644 --- 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 index 0a07795a..e5e72a4c 100644 --- 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 index 6f4a76f6..ecedc79d 100644 --- 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 index 0d7d9e71..046542f4 100644 --- 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 index 00f13dcc..7f72ded2 100644 --- 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 index 0941d7f6..1c4d6c8d 100644 --- 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 index 0436a3f4..0b154d02 100644 --- 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 index 04715b36..09312f56 100644 --- 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 index 5e511dbb..90e14198 100644 --- 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 index c1cf7b1a..94be96b3 100644 --- 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 index 4fdf1d54..18f7e202 100644 --- 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 index 8bb9f456..1f1b1960 100644 --- 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 index 5875383f..34092e7f 100644 --- 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 index 53c53ecf..bb17b42f 100644 --- 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 index e4237b31..ba04f1b7 100644 --- 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 index cbdd3965..01d6fa26 100644 --- 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 { diff --git a/FetchXmlBuilder/ControlsClasses/OperatorItem.cs b/FetchXmlBuilder/ControlsClasses/OperatorItem.cs index cbb5d6fa..302f1fc9 100644 --- a/FetchXmlBuilder/ControlsClasses/OperatorItem.cs +++ b/FetchXmlBuilder/ControlsClasses/OperatorItem.cs @@ -3,23 +3,27 @@ using Microsoft.Xrm.Sdk.Query; using System.Collections.Generic; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.ControlsClasses { public class OperatorItem : IComboBoxItem { private ConditionOperator oper = ConditionOperator.Equal; /// Property that indicates what type the value must have for the condition to be valid - public AttributeTypeCode? ValueType { get { return GetValueType(); } } + public AttributeTypeCode? ValueType + { get { return GetValueType(); } } /// Property that indicates if operator allows "values" collection - public bool IsMultipleValuesType { get { return GetIsMultipleValuesType(); } } + public bool IsMultipleValuesType + { get { return GetIsMultipleValuesType(); } } /// Property that indicates if operator allows column comparison - public bool SupportsColumnComparison { get { return GetSupportsColumnComparison(); } } + public bool SupportsColumnComparison + { get { return GetSupportsColumnComparison(); } } /// Property that indicates what type the attribute must be of for the condition to be valid - public AttributeTypeCode? AttributeType { get { return GetAttributeType(); } } + public AttributeTypeCode? AttributeType + { get { return GetAttributeType(); } } public OperatorItem(ConditionOperator Operator) { diff --git a/FetchXmlBuilder/ControlsClasses/OptionsetItem.cs b/FetchXmlBuilder/ControlsClasses/OptionsetItem.cs index a0594080..444eaac2 100644 --- a/FetchXmlBuilder/ControlsClasses/OptionsetItem.cs +++ b/FetchXmlBuilder/ControlsClasses/OptionsetItem.cs @@ -1,7 +1,7 @@ using Cinteros.Xrm.XmlEditorUtils; using Microsoft.Xrm.Sdk.Metadata; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.ControlsClasses { internal class OptionsetItem : IComboBoxItem { diff --git a/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs b/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs index 52e6516f..a8a6882b 100644 --- a/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs +++ b/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs @@ -5,7 +5,7 @@ using System.Text; using System.Xml; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Converters { public class CSharpCodeGenerator { @@ -35,7 +35,7 @@ public static string GetCSharpCode(string fetchXml) if (data.Count > 0) { - cs = "var fetchData = new {\r\n " + String.Join(",\r\n ", data.Select(kvp => $"{kvp.Key} = \"{kvp.Value.Replace("\\", "\\\\").Replace("\"", "\\\"")}\"")) + "\r\n};\r\n"; + cs = "var fetchData = new {\r\n " + string.Join(",\r\n ", data.Select(kvp => $"{kvp.Key} = \"{kvp.Value.Replace("\\", "\\\\").Replace("\"", "\\\"")}\"")) + "\r\n};\r\n"; } var sb = new StringBuilder(); diff --git a/FetchXmlBuilder/Converters/JavascriptCodeGenerator.cs b/FetchXmlBuilder/Converters/JavascriptCodeGenerator.cs index 1b1fe707..5e25f336 100644 --- a/FetchXmlBuilder/Converters/JavascriptCodeGenerator.cs +++ b/FetchXmlBuilder/Converters/JavascriptCodeGenerator.cs @@ -1,11 +1,10 @@ -using System; +using Newtonsoft.Json; using System.Collections.Generic; using System.Linq; using System.Security; using System.Xml; -using Newtonsoft.Json; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Converters { public class JavascriptCodeGenerator { @@ -25,7 +24,7 @@ public static string GetJavascriptCode(string fetchXml) js = $"var fetchData = {JsonConvert.SerializeObject(data, Newtonsoft.Json.Formatting.Indented)};\r\n"; } - js += $"var fetchXml = [\r\n{String.Join(",\r\n", lines)}\r\n].join(\"\");"; + js += $"var fetchXml = [\r\n{string.Join(",\r\n", lines)}\r\n].join(\"\");"; return js; } @@ -55,7 +54,7 @@ private static void Convert(XmlElement element, int depth, List lines, D { line += "/>"; lineComponents.Add(JsonConvert.SerializeObject(line)); - lines.Add(String.Join(", ", lineComponents)); + lines.Add(string.Join(", ", lineComponents)); } else { @@ -66,12 +65,12 @@ private static void Convert(XmlElement element, int depth, List lines, D { AddData(parentElement.GetAttribute("attribute"), element.InnerText.Trim(), data, lineComponents); lineComponents.Add("\"\""); - lines.Add(String.Join(", ", lineComponents)); + lines.Add(string.Join(", ", lineComponents)); } else { - lines.Add(String.Join(", ", lineComponents)); - + lines.Add(string.Join(", ", lineComponents)); + foreach (var child in element.ChildNodes.OfType()) { Convert(child, depth + 1, lines, data); diff --git a/FetchXmlBuilder/Converters/ODataCodeGenerator.cs b/FetchXmlBuilder/Converters/ODataCodeGenerator.cs index 2fafc62d..b30d7466 100644 --- a/FetchXmlBuilder/Converters/ODataCodeGenerator.cs +++ b/FetchXmlBuilder/Converters/ODataCodeGenerator.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Converters { public class ODataCodeGenerator { diff --git a/FetchXmlBuilder/Converters/QueryExpressionCodeGenerator.cs b/FetchXmlBuilder/Converters/QueryExpressionCodeGenerator.cs index 663bcb72..09b009b9 100644 --- a/FetchXmlBuilder/Converters/QueryExpressionCodeGenerator.cs +++ b/FetchXmlBuilder/Converters/QueryExpressionCodeGenerator.cs @@ -1,15 +1,14 @@ -using Microsoft.Xrm.Sdk; +using Cinteros.Xrm.FetchXmlBuilder.Extensions; +using Microsoft.CSharp; +using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Query; 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.Xrm.Extensions; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Converters { public class QueryExpressionCodeGenerator { @@ -251,7 +250,7 @@ private static string GetQueryExpressionFromScript(string query) using System; using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Query; - + namespace DynamicContentGenerator {{ public class Generator diff --git a/FetchXmlBuilder/Converters/SQLQueryGenerator.cs b/FetchXmlBuilder/Converters/SQLQueryGenerator.cs index 6e14d6e5..4b431252 100644 --- a/FetchXmlBuilder/Converters/SQLQueryGenerator.cs +++ b/FetchXmlBuilder/Converters/SQLQueryGenerator.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Converters { internal class SQLQueryGenerator { diff --git a/FetchXmlBuilder/DockControls/ResultGrid.cs b/FetchXmlBuilder/DockControls/ResultGrid.cs index 1aef9bba..d0480c21 100644 --- a/FetchXmlBuilder/DockControls/ResultGrid.cs +++ b/FetchXmlBuilder/DockControls/ResultGrid.cs @@ -1,4 +1,6 @@ using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Converters; +using Cinteros.Xrm.FetchXmlBuilder.Extensions; using Microsoft.Xrm.Sdk; using System; using System.Diagnostics; diff --git a/FetchXmlBuilder/DockControls/TreeBuilderControl.cs b/FetchXmlBuilder/DockControls/TreeBuilderControl.cs index cd3c7f37..6067533a 100644 --- a/FetchXmlBuilder/DockControls/TreeBuilderControl.cs +++ b/FetchXmlBuilder/DockControls/TreeBuilderControl.cs @@ -1,4 +1,4 @@ -using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Builder; using Cinteros.Xrm.FetchXmlBuilder.Controls; using Cinteros.Xrm.FetchXmlBuilder.Forms; using Cinteros.Xrm.XmlEditorUtils; @@ -13,6 +13,8 @@ using System.Xml; using System.Xml.Linq; using System.Xml.Serialization; +using Cinteros.Xrm.FetchXmlBuilder.Extensions; +using Cinteros.Xrm.FetchXmlBuilder.AppCode; namespace Cinteros.Xrm.FetchXmlBuilder.DockControls { diff --git a/FetchXmlBuilder/DockControls/XmlContentControl.cs b/FetchXmlBuilder/DockControls/XmlContentControl.cs index 23b77a20..1046f028 100644 --- a/FetchXmlBuilder/DockControls/XmlContentControl.cs +++ b/FetchXmlBuilder/DockControls/XmlContentControl.cs @@ -1,4 +1,7 @@ using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Converters; +using Cinteros.Xrm.FetchXmlBuilder.Extensions; +using Cinteros.Xrm.FetchXmlBuilder.Settings; using Cinteros.Xrm.XmlEditorUtils; using MarkMpn.XmlSchemaAutocomplete.Scintilla; using Microsoft.Xrm.Sdk.Metadata; diff --git a/FetchXmlBuilder/Extensions/ConnectionExtensions.cs b/FetchXmlBuilder/Extensions/ConnectionExtensions.cs index ebe6cd77..ef9e0a42 100644 --- a/FetchXmlBuilder/Extensions/ConnectionExtensions.cs +++ b/FetchXmlBuilder/Extensions/ConnectionExtensions.cs @@ -3,7 +3,7 @@ using System; using System.Windows.Forms; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Extensions { public static class ConnectionExtensions { @@ -55,6 +55,7 @@ public static string GetEntityUrl(this ConnectionDetail connectiondetail, Entity entref.LogicalName = entity["activitytypecode"].ToString(); } break; + case "activityparty": if (!entity.Contains("partyid")) { @@ -88,4 +89,4 @@ public static string GetEntityReferenceUrl(this ConnectionDetail connectiondetai return url; } } -} +} \ No newline at end of file diff --git a/FetchXmlBuilder/Extensions/DockExtensions.cs b/FetchXmlBuilder/Extensions/DockExtensions.cs index 26a7c813..9cf80d19 100644 --- a/FetchXmlBuilder/Extensions/DockExtensions.cs +++ b/FetchXmlBuilder/Extensions/DockExtensions.cs @@ -1,6 +1,6 @@ using WeifenLuo.WinFormsUI.Docking; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Extensions { public static class DockExtensions { @@ -12,15 +12,19 @@ public static void EnsureVisible(this DockContent form, DockPanel parent, DockSt case DockState.Hidden: form.Show(parent, defaultState); break; + case DockState.DockBottomAutoHide: form.DockState = DockState.DockBottom; break; + case DockState.DockTopAutoHide: form.DockState = DockState.DockTop; break; + case DockState.DockLeftAutoHide: form.DockState = DockState.DockLeft; break; + case DockState.DockRightAutoHide: form.DockState = DockState.DockRight; break; diff --git a/FetchXmlBuilder/Extensions/Extensions.cs b/FetchXmlBuilder/Extensions/Extensions.cs index 2f33432b..d9a5c381 100644 --- a/FetchXmlBuilder/Extensions/Extensions.cs +++ b/FetchXmlBuilder/Extensions/Extensions.cs @@ -4,7 +4,7 @@ using System.Xml; using System.Xml.Linq; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Extensions { public static class Extensions { diff --git a/FetchXmlBuilder/Extensions/GroupBoxExpanderExtensions.cs b/FetchXmlBuilder/Extensions/GroupBoxExpanderExtensions.cs index 108cf004..9fc6d491 100644 --- a/FetchXmlBuilder/Extensions/GroupBoxExpanderExtensions.cs +++ b/FetchXmlBuilder/Extensions/GroupBoxExpanderExtensions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Windows.Forms; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Extensions { public static class GroupBoxExpanderExtensions { @@ -48,7 +48,7 @@ public static void PrepareGroupBoxExpanders(this Control control) private static IEnumerable GetAll(this Control control, Type type) { var controls = control.Controls.Cast(); - return controls.SelectMany(ctrl => GetAll(ctrl, type)) + return controls.SelectMany(ctrl => ctrl.GetAll(type)) .Concat(controls) .Where(c => c.GetType() == type); } diff --git a/FetchXmlBuilder/Extensions/ServiceExtensions.cs b/FetchXmlBuilder/Extensions/ServiceExtensions.cs index 75df646f..ce20233e 100644 --- a/FetchXmlBuilder/Extensions/ServiceExtensions.cs +++ b/FetchXmlBuilder/Extensions/ServiceExtensions.cs @@ -3,7 +3,7 @@ using Microsoft.Xrm.Sdk.Query; using System.Xml; -namespace Rappen.Xrm.Extensions +namespace Cinteros.Xrm.FetchXmlBuilder.Extensions { public static class ServiceExtensions { diff --git a/FetchXmlBuilder/FXBGui.cs b/FetchXmlBuilder/FXBGui.cs index 2da86f35..8aa3108b 100644 --- a/FetchXmlBuilder/FXBGui.cs +++ b/FetchXmlBuilder/FXBGui.cs @@ -1,6 +1,10 @@ using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Converters; using Cinteros.Xrm.FetchXmlBuilder.DockControls; +using Cinteros.Xrm.FetchXmlBuilder.Extensions; using Cinteros.Xrm.FetchXmlBuilder.Forms; +using Cinteros.Xrm.FetchXmlBuilder.Settings; +using Cinteros.Xrm.FetchXmlBuilder.Views; using Cinteros.Xrm.XmlEditorUtils; using Microsoft.Crm.Sdk.Messages; using Microsoft.Xrm.Sdk; diff --git a/FetchXmlBuilder/FXBInterfaces.cs b/FetchXmlBuilder/FXBInterfaces.cs index 16a6d04b..178b055b 100644 --- a/FetchXmlBuilder/FXBInterfaces.cs +++ b/FetchXmlBuilder/FXBInterfaces.cs @@ -1,4 +1,5 @@ using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Extensions; using Cinteros.Xrm.FetchXmlBuilder.Forms; using System; using System.Reflection; @@ -142,7 +143,7 @@ public void ShowAboutDialog() public void ShowSettings() { - var settingDlg = new Settings(this); + var settingDlg = new Forms.Settings(this); LogUse("OpenOptions"); if (settingDlg.ShowDialog(this) == DialogResult.OK) { diff --git a/FetchXmlBuilder/FXBMetadata.cs b/FetchXmlBuilder/FXBMetadata.cs index 9cfd9fb9..d69a76ce 100644 --- a/FetchXmlBuilder/FXBMetadata.cs +++ b/FetchXmlBuilder/FXBMetadata.cs @@ -1,4 +1,4 @@ -using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Settings; using McTools.Xrm.Connection; using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Messages; diff --git a/FetchXmlBuilder/FXBQueries.cs b/FetchXmlBuilder/FXBQueries.cs index 505d6bc3..ce9e8d05 100644 --- a/FetchXmlBuilder/FXBQueries.cs +++ b/FetchXmlBuilder/FXBQueries.cs @@ -1,5 +1,7 @@ using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Converters; using Cinteros.Xrm.FetchXmlBuilder.DockControls; +using Cinteros.Xrm.FetchXmlBuilder.Settings; using Microsoft.Crm.Sdk.Messages; using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Query; diff --git a/FetchXmlBuilder/FetchXmlBuilder.cs b/FetchXmlBuilder/FetchXmlBuilder.cs index 567e45d6..a4f76f52 100644 --- a/FetchXmlBuilder/FetchXmlBuilder.cs +++ b/FetchXmlBuilder/FetchXmlBuilder.cs @@ -1,4 +1,5 @@ -using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Converters; +using Cinteros.Xrm.FetchXmlBuilder.Builder; using Cinteros.Xrm.FetchXmlBuilder.Controls; using Cinteros.Xrm.FetchXmlBuilder.DockControls; using Cinteros.Xrm.FetchXmlBuilder.Forms; @@ -18,6 +19,9 @@ using WeifenLuo.WinFormsUI.Docking; using XrmToolBox.Extensibility; using XrmToolBox.Extensibility.Args; +using Cinteros.Xrm.FetchXmlBuilder.Extensions; +using Cinteros.Xrm.FetchXmlBuilder.Settings; +using Cinteros.Xrm.FetchXmlBuilder.AppCode; namespace Cinteros.Xrm.FetchXmlBuilder { diff --git a/FetchXmlBuilder/FetchXmlBuilder.csproj b/FetchXmlBuilder/FetchXmlBuilder.csproj index 008696d7..ced6cb0f 100644 --- a/FetchXmlBuilder/FetchXmlBuilder.csproj +++ b/FetchXmlBuilder/FetchXmlBuilder.csproj @@ -228,9 +228,11 @@ + + UserControl @@ -243,7 +245,6 @@ - @@ -253,7 +254,6 @@ - diff --git a/FetchXmlBuilder/Forms/SelectAttributesDialog.cs b/FetchXmlBuilder/Forms/SelectAttributesDialog.cs index db3cb802..baf2ba4e 100644 --- a/FetchXmlBuilder/Forms/SelectAttributesDialog.cs +++ b/FetchXmlBuilder/Forms/SelectAttributesDialog.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Windows.Forms; using System.Linq; -using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Extensions; namespace Cinteros.Xrm.FetchXmlBuilder.Forms { diff --git a/FetchXmlBuilder/Forms/SelectMLDialog.cs b/FetchXmlBuilder/Forms/SelectMLDialog.cs index f7f64d6b..26012839 100644 --- a/FetchXmlBuilder/Forms/SelectMLDialog.cs +++ b/FetchXmlBuilder/Forms/SelectMLDialog.cs @@ -1,4 +1,5 @@ using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Views; using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Query; using System; diff --git a/FetchXmlBuilder/Forms/SelectViewDialog.cs b/FetchXmlBuilder/Forms/SelectViewDialog.cs index 8bd80b1d..19080bbd 100644 --- a/FetchXmlBuilder/Forms/SelectViewDialog.cs +++ b/FetchXmlBuilder/Forms/SelectViewDialog.cs @@ -1,4 +1,6 @@ using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.ControlsClasses; +using Cinteros.Xrm.FetchXmlBuilder.Views; using Cinteros.Xrm.XmlEditorUtils; using Microsoft.Xrm.Sdk; using System; diff --git a/FetchXmlBuilder/Forms/Settings.Designer.cs b/FetchXmlBuilder/Forms/Settings.Designer.cs index 15b50e7f..5b1a1bda 100644 --- a/FetchXmlBuilder/Forms/Settings.Designer.cs +++ b/FetchXmlBuilder/Forms/Settings.Designer.cs @@ -1,4 +1,4 @@ -using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Settings; namespace Cinteros.Xrm.FetchXmlBuilder.Forms { @@ -31,7 +31,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Settings)); - Cinteros.Xrm.FetchXmlBuilder.AppCode.XmlColors xmlColors1 = new Cinteros.Xrm.FetchXmlBuilder.AppCode.XmlColors(); + XmlColors xmlColors1 = new Cinteros.Xrm.FetchXmlBuilder.Settings.XmlColors(); this.gbResult = new System.Windows.Forms.GroupBox(); this.chkClickableLinks = new System.Windows.Forms.CheckBox(); this.cmbResult = new System.Windows.Forms.ComboBox(); diff --git a/FetchXmlBuilder/Forms/Settings.cs b/FetchXmlBuilder/Forms/Settings.cs index 7d5b24db..c6ad72a6 100644 --- a/FetchXmlBuilder/Forms/Settings.cs +++ b/FetchXmlBuilder/Forms/Settings.cs @@ -1,4 +1,5 @@ using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Settings; using System; using System.Windows.Forms; diff --git a/FetchXmlBuilder/Forms/ShowMetadataOptions.cs b/FetchXmlBuilder/Forms/ShowMetadataOptions.cs index 8bd038b2..85f4b6cc 100644 --- a/FetchXmlBuilder/Forms/ShowMetadataOptions.cs +++ b/FetchXmlBuilder/Forms/ShowMetadataOptions.cs @@ -1,4 +1,5 @@ -using Cinteros.Xrm.FetchXmlBuilder.AppCode; +using Cinteros.Xrm.FetchXmlBuilder.Extensions; +using Cinteros.Xrm.FetchXmlBuilder.Settings; using Microsoft.Xrm.Sdk; using Microsoft.Xrm.Sdk.Query; using System; diff --git a/FetchXmlBuilder/Settings/FXBConnectionSettings.cs b/FetchXmlBuilder/Settings/FXBConnectionSettings.cs index ddd1a269..be9caaf6 100644 --- a/FetchXmlBuilder/Settings/FXBConnectionSettings.cs +++ b/FetchXmlBuilder/Settings/FXBConnectionSettings.cs @@ -2,7 +2,7 @@ using System; using System.Windows.Forms; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Settings { public class FXBConnectionSettings { diff --git a/FetchXmlBuilder/Settings/FXBSettings.cs b/FetchXmlBuilder/Settings/FXBSettings.cs index 4fb1384c..cee2f16b 100644 --- a/FetchXmlBuilder/Settings/FXBSettings.cs +++ b/FetchXmlBuilder/Settings/FXBSettings.cs @@ -8,13 +8,14 @@ using System.Xml.Serialization; using WeifenLuo.WinFormsUI.Docking; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Settings { public class FXBSettings { private bool _useFriendlyNames; - public bool UseFriendlyNames { get { return _useFriendlyNames; } set { _useFriendlyNames = value; FetchXmlBuilder.friendlyNames = value; } } + public bool UseFriendlyNames + { get { return _useFriendlyNames; } set { _useFriendlyNames = value; FetchXmlBuilder.friendlyNames = value; } } public QueryOptions QueryOptions { get; set; } = new QueryOptions(); public ResultOptions Results { get; set; } = new ResultOptions(); public string CurrentVersion { get; set; } @@ -161,22 +162,28 @@ public override string ToString() public class XmlColors { [Browsable(false)] - public string ElementColor { get { return Element.Name; } set { Element = Color.FromName(value); } } + public string ElementColor + { get { return Element.Name; } set { Element = Color.FromName(value); } } [Browsable(false)] - public string ValueColor { get { return Value.Name; } set { Value = Color.FromName(value); } } + public string ValueColor + { get { return Value.Name; } set { Value = Color.FromName(value); } } [Browsable(false)] - public string AttributeKeyColor { get { return AttributeKey.Name; } set { AttributeKey = Color.FromName(value); } } + public string AttributeKeyColor + { get { return AttributeKey.Name; } set { AttributeKey = Color.FromName(value); } } [Browsable(false)] - public string AttributeValueColor { get { return AttributeValue.Name; } set { AttributeValue = Color.FromName(value); } } + public string AttributeValueColor + { get { return AttributeValue.Name; } set { AttributeValue = Color.FromName(value); } } [Browsable(false)] - public string CommentColor { get { return Comment.Name; } set { Comment = Color.FromName(value); } } + public string CommentColor + { get { return Comment.Name; } set { Comment = Color.FromName(value); } } [Browsable(false)] - public string TagColor { get { return Tag.Name; } set { Tag = Color.FromName(value); } } + public string TagColor + { get { return Tag.Name; } set { Tag = Color.FromName(value); } } [XmlIgnore()] public Color Element { get; set; } = Color.DarkRed; diff --git a/FetchXmlBuilder/Views/ViewItem.cs b/FetchXmlBuilder/Views/ViewItem.cs index be8774ae..442e025c 100644 --- a/FetchXmlBuilder/Views/ViewItem.cs +++ b/FetchXmlBuilder/Views/ViewItem.cs @@ -1,7 +1,7 @@ using Cinteros.Xrm.XmlEditorUtils; using Microsoft.Xrm.Sdk; -namespace Cinteros.Xrm.FetchXmlBuilder.AppCode +namespace Cinteros.Xrm.FetchXmlBuilder.Views { public class ViewItem : IComboBoxItem { @@ -49,9 +49,9 @@ public static bool IsCustomizable(this Entity entity) { return entity != null && (entity.LogicalName == "userquery" - || (entity.Contains("iscustomizable") + || entity.Contains("iscustomizable") && entity["iscustomizable"] is BooleanManagedProperty iscust - && iscust.Value)); + && iscust.Value); } } } \ No newline at end of file