diff --git a/LCG-UDG/Generation/Extensions.cs b/LCG-UDG/Generation/Extensions.cs index 265df66..7744bf9 100644 --- a/LCG-UDG/Generation/Extensions.cs +++ b/LCG-UDG/Generation/Extensions.cs @@ -141,19 +141,16 @@ private static bool AddBlankLineBetween(string lastline, string line) public static string CamelCaseIt(this string name, Settings settings) { - var words = settings.commonsettings.CamelCaseWords.Split(',').Select(w => w.Trim()); - var endwords = settings.commonsettings.CamelCaseWordEnds.Split(',').Select(w => w.Trim()); - bool WordBeginOrEnd(string text, int i) { var last = text.Substring(0, i).ToLowerInvariant(); var next = text.Substring(i).ToLowerInvariant(); - foreach (var word in words) + foreach (var word in settings.commonsettings.CamelCaseWords) { if (last.EndsWith(word) || next.StartsWith(word)) { // Found a "word" in the string (for example "count" var isunbreakable = false; - foreach (var unbreak in words) + foreach (var unbreak in settings.commonsettings.CamelCaseWords) { // Check that this word is not also part of a bigger word (for example "account" var len = unbreak.Length; var pos = text.ToLowerInvariant().IndexOf(unbreak); @@ -169,7 +166,7 @@ bool WordBeginOrEnd(string text, int i) } } } - foreach (var word in endwords) + foreach (var word in settings.commonsettings.CamelCaseWordEnds) { if (next.Equals(word)) { diff --git a/LCG-UDG/LCG.cs b/LCG-UDG/LCG.cs index b3500e3..2c8d768 100644 --- a/LCG-UDG/LCG.cs +++ b/LCG-UDG/LCG.cs @@ -401,6 +401,7 @@ private void ApplySettings() chkAttPrimaryKey.Checked = settings.AttributeFilter?.PrimaryKey == true; chkAttPrimaryAttribute.Checked = settings.AttributeFilter?.PrimaryAttribute == true; chkAttLogical.Checked = settings.AttributeFilter?.Logical == true; + chkAttInternal.Checked = settings.AttributeFilter?.Internal == true; chkRelCheckAll.Checked = settings.RelationshipFilter?.CheckAll != false; rbRelCustomAll.Checked = settings.RelationshipFilter?.CustomAll != false; rbRelCustomFalse.Checked = settings.RelationshipFilter?.CustomFalse == true; @@ -584,36 +585,42 @@ private bool GetFileSettings() private IEnumerable GetFilteredAttributes() { - bool GetCustomFilter(AttributeMetadataProxy e) + bool GetCustomFilter(AttributeMetadataProxy a) { return rbAttCustomAll.Checked || - rbAttCustomTrue.Checked && e.Metadata.IsCustomAttribute.GetValueOrDefault() || - rbAttCustomFalse.Checked && !e.Metadata.IsCustomAttribute.GetValueOrDefault(); + rbAttCustomTrue.Checked && a.Metadata.IsCustomAttribute.GetValueOrDefault() || + rbAttCustomFalse.Checked && !a.Metadata.IsCustomAttribute.GetValueOrDefault(); } - bool GetManagedFilter(AttributeMetadataProxy e) + bool GetManagedFilter(AttributeMetadataProxy a) { return rbAttMgdAll.Checked || - rbAttMgdTrue.Checked && e.Metadata.IsManaged.GetValueOrDefault() || - rbAttMgdFalse.Checked && !e.Metadata.IsManaged.GetValueOrDefault(); + rbAttMgdTrue.Checked && a.Metadata.IsManaged.GetValueOrDefault() || + rbAttMgdFalse.Checked && !a.Metadata.IsManaged.GetValueOrDefault(); } - bool GetSearchFilter(AttributeMetadataProxy e) + bool GetSearchFilter(AttributeMetadataProxy a) { return string.IsNullOrWhiteSpace(txtAttSearch.Text) || - e.Metadata.LogicalName.ToLowerInvariant().Contains(txtAttSearch.Text) || - e.Metadata.DisplayName?.UserLocalizedLabel?.Label?.ToLowerInvariant().Contains(txtAttSearch.Text) == true; + a.Metadata.LogicalName.ToLowerInvariant().Contains(txtAttSearch.Text) || + a.Metadata.DisplayName?.UserLocalizedLabel?.Label?.ToLowerInvariant().Contains(txtAttSearch.Text) == true; } - bool GetLogicalFilter(AttributeMetadataProxy e) + bool GetLogicalFilter(AttributeMetadataProxy a) { return chkAttLogical.Checked || - e.Metadata.IsLogical != true; + a.Metadata.IsLogical != true; + } + bool GetInternalFilter(AttributeMetadataProxy a) + { + return chkAttInternal.Checked || + !commonsettings.InternalAttributes.Contains(a.LogicalName); } return selectedEntity.Attributes .Where( - e => GetCustomFilter(e) - && GetManagedFilter(e) - && GetSearchFilter(e) - && GetLogicalFilter(e)); + a => GetCustomFilter(a) + && GetManagedFilter(a) + && GetSearchFilter(a) + && GetLogicalFilter(a) + &&GetInternalFilter(a)); } private IEnumerable GetFilteredEntities() @@ -913,11 +920,7 @@ private void LoadCommonSettings() { LogInfo("Common Settings found and loaded"); } - if (commonsettings.Template.TemplateVersion != new Template(isUML).TemplateVersion) - { - //MessageBox.Show("Template has been updated.\nAny customizations will need to be recreated.", "Template", MessageBoxButtons.OK, MessageBoxIcon.Information); - commonsettings.Template = new Template(isUML); - } + commonsettings.MigrateFromOldConfig(isUML); commonsettings.SetFixedValues(isUML); } diff --git a/LCG-UDG/LCG.designer.cs b/LCG-UDG/LCG.designer.cs index a290121..4e22a25 100644 --- a/LCG-UDG/LCG.designer.cs +++ b/LCG-UDG/LCG.designer.cs @@ -55,6 +55,10 @@ private void InitializeComponent() this.pnEntityGrid = new System.Windows.Forms.Panel(); this.chkEntAll = new System.Windows.Forms.CheckBox(); this.gridEntities = new System.Windows.Forms.DataGridView(); + this.statusEntities = new System.Windows.Forms.StatusStrip(); + this.statusEntitiesShowing = new System.Windows.Forms.ToolStripStatusLabel(); + this.statusEntitiesSelected = new System.Windows.Forms.ToolStripStatusLabel(); + this.lblEntNoMatch = new System.Windows.Forms.Label(); this.gbEntities = new System.Windows.Forms.GroupBox(); this.pnEntSearch = new System.Windows.Forms.Panel(); this.txtEntSearch = new System.Windows.Forms.TextBox(); @@ -76,9 +80,6 @@ private void InitializeComponent() this.pnEntSolution = new System.Windows.Forms.Panel(); this.cmbSolution = new System.Windows.Forms.ComboBox(); this.label4 = new System.Windows.Forms.Label(); - this.statusEntities = new System.Windows.Forms.StatusStrip(); - this.statusEntitiesShowing = new System.Windows.Forms.ToolStripStatusLabel(); - this.statusEntitiesSelected = new System.Windows.Forms.ToolStripStatusLabel(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pnAttributeGrid = new System.Windows.Forms.Panel(); this.chkAttAll = new System.Windows.Forms.CheckBox(); @@ -86,6 +87,7 @@ private void InitializeComponent() this.statusAttributes = new System.Windows.Forms.StatusStrip(); this.statusAttributesShowing = new System.Windows.Forms.ToolStripStatusLabel(); this.statusAttributesSelected = new System.Windows.Forms.ToolStripStatusLabel(); + this.lblAttNoMatch = new System.Windows.Forms.Label(); this.gbAttributes = new System.Windows.Forms.GroupBox(); this.pnAttSearch = new System.Windows.Forms.Panel(); this.txtAttSearch = new System.Windows.Forms.TextBox(); @@ -112,6 +114,10 @@ private void InitializeComponent() this.pnRelationshipGrid = new System.Windows.Forms.Panel(); this.chkRelAll = new System.Windows.Forms.CheckBox(); this.gridRelationships = new System.Windows.Forms.DataGridView(); + this.statusRelationships = new System.Windows.Forms.StatusStrip(); + this.statusRelationshipsShowing = new System.Windows.Forms.ToolStripStatusLabel(); + this.statusRelationshipsSelected = new System.Windows.Forms.ToolStripStatusLabel(); + this.lblRelNoMatch = new System.Windows.Forms.Label(); this.gbRelationships = new System.Windows.Forms.GroupBox(); this.panRelSearch = new System.Windows.Forms.Panel(); this.txtRelSearch = new System.Windows.Forms.TextBox(); @@ -140,17 +146,13 @@ private void InitializeComponent() this.label8 = new System.Windows.Forms.Label(); this.chkRelCheckAll = new System.Windows.Forms.CheckBox(); this.llRelationshipExpander = new System.Windows.Forms.LinkLabel(); - this.statusRelationships = new System.Windows.Forms.StatusStrip(); - this.statusRelationshipsShowing = new System.Windows.Forms.ToolStripStatusLabel(); - this.statusRelationshipsSelected = new System.Windows.Forms.ToolStripStatusLabel(); this.tmEntSearch = new System.Windows.Forms.Timer(this.components); this.tmAttSearch = new System.Windows.Forms.Timer(this.components); this.pnWindowTopSpacer = new System.Windows.Forms.Panel(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.tmRelSearch = new System.Windows.Forms.Timer(this.components); - this.lblRelNoMatch = new System.Windows.Forms.Label(); - this.lblAttNoMatch = new System.Windows.Forms.Label(); - this.lblEntNoMatch = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.chkAttInternal = new System.Windows.Forms.CheckBox(); this.toolStripMenu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -158,13 +160,13 @@ private void InitializeComponent() this.splitContainer1.SuspendLayout(); this.pnEntityGrid.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gridEntities)).BeginInit(); + this.statusEntities.SuspendLayout(); this.gbEntities.SuspendLayout(); this.pnEntSearch.SuspendLayout(); this.pnEntIntersect.SuspendLayout(); this.pnEntManaged.SuspendLayout(); this.pnEntCustom.SuspendLayout(); this.pnEntSolution.SuspendLayout(); - this.statusEntities.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); this.splitContainer2.Panel1.SuspendLayout(); this.splitContainer2.Panel2.SuspendLayout(); @@ -180,6 +182,7 @@ private void InitializeComponent() this.pnAttBehavior.SuspendLayout(); this.pnRelationshipGrid.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gridRelationships)).BeginInit(); + this.statusRelationships.SuspendLayout(); this.gbRelationships.SuspendLayout(); this.panRelSearch.SuspendLayout(); this.panRel4.SuspendLayout(); @@ -187,7 +190,6 @@ private void InitializeComponent() this.panRel3.SuspendLayout(); this.panRel2.SuspendLayout(); this.panRel1.SuspendLayout(); - this.statusRelationships.SuspendLayout(); this.SuspendLayout(); // // toolStripMenu @@ -384,6 +386,40 @@ private void InitializeComponent() this.gridEntities.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.gridEntities_CellFormatting); this.gridEntities.SelectionChanged += new System.EventHandler(this.gridEntities_SelectionChanged); // + // statusEntities + // + this.statusEntities.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.statusEntitiesShowing, + this.statusEntitiesSelected}); + this.statusEntities.Location = new System.Drawing.Point(0, 524); + this.statusEntities.Name = "statusEntities"; + this.statusEntities.Size = new System.Drawing.Size(347, 22); + this.statusEntities.SizingGrip = false; + this.statusEntities.TabIndex = 2; + this.statusEntities.Text = "statusStrip1"; + // + // statusEntitiesShowing + // + this.statusEntitiesShowing.Name = "statusEntitiesShowing"; + this.statusEntitiesShowing.Size = new System.Drawing.Size(77, 17); + this.statusEntitiesShowing.Text = "Load entities!"; + // + // statusEntitiesSelected + // + this.statusEntitiesSelected.Name = "statusEntitiesSelected"; + this.statusEntitiesSelected.Size = new System.Drawing.Size(0, 17); + // + // lblEntNoMatch + // + this.lblEntNoMatch.Dock = System.Windows.Forms.DockStyle.Top; + this.lblEntNoMatch.Location = new System.Drawing.Point(0, 148); + this.lblEntNoMatch.Name = "lblEntNoMatch"; + this.lblEntNoMatch.Size = new System.Drawing.Size(347, 69); + this.lblEntNoMatch.TabIndex = 8; + this.lblEntNoMatch.Text = "No entities match current filter"; + this.lblEntNoMatch.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lblEntNoMatch.Visible = false; + // // gbEntities // this.gbEntities.Controls.Add(this.pnEntSearch); @@ -443,6 +479,7 @@ private void InitializeComponent() // // pnEntIntersect // + this.pnEntIntersect.Controls.Add(this.label10); this.pnEntIntersect.Controls.Add(this.chkEntSelected); this.pnEntIntersect.Controls.Add(this.chkEntIntersect); this.pnEntIntersect.Dock = System.Windows.Forms.DockStyle.Top; @@ -469,9 +506,9 @@ private void InitializeComponent() this.chkEntIntersect.CheckState = System.Windows.Forms.CheckState.Checked; this.chkEntIntersect.Location = new System.Drawing.Point(99, 5); this.chkEntIntersect.Name = "chkEntIntersect"; - this.chkEntIntersect.Size = new System.Drawing.Size(104, 17); + this.chkEntIntersect.Size = new System.Drawing.Size(67, 17); this.chkEntIntersect.TabIndex = 0; - this.chkEntIntersect.Text = "Include intersect"; + this.chkEntIntersect.Text = "Intersect"; this.chkEntIntersect.UseVisualStyleBackColor = true; this.chkEntIntersect.CheckedChanged += new System.EventHandler(this.filter_entity_Changed); // @@ -620,29 +657,6 @@ private void InitializeComponent() this.label4.TabIndex = 0; this.label4.Text = "Solution"; // - // statusEntities - // - this.statusEntities.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.statusEntitiesShowing, - this.statusEntitiesSelected}); - this.statusEntities.Location = new System.Drawing.Point(0, 524); - this.statusEntities.Name = "statusEntities"; - this.statusEntities.Size = new System.Drawing.Size(347, 22); - this.statusEntities.SizingGrip = false; - this.statusEntities.TabIndex = 2; - this.statusEntities.Text = "statusStrip1"; - // - // statusEntitiesShowing - // - this.statusEntitiesShowing.Name = "statusEntitiesShowing"; - this.statusEntitiesShowing.Size = new System.Drawing.Size(77, 17); - this.statusEntitiesShowing.Text = "Load entities!"; - // - // statusEntitiesSelected - // - this.statusEntitiesSelected.Name = "statusEntitiesSelected"; - this.statusEntitiesSelected.Size = new System.Drawing.Size(0, 17); - // // splitContainer2 // this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -753,6 +767,17 @@ private void InitializeComponent() this.statusAttributesSelected.Name = "statusAttributesSelected"; this.statusAttributesSelected.Size = new System.Drawing.Size(0, 17); // + // lblAttNoMatch + // + this.lblAttNoMatch.Dock = System.Windows.Forms.DockStyle.Top; + this.lblAttNoMatch.Location = new System.Drawing.Point(0, 148); + this.lblAttNoMatch.Name = "lblAttNoMatch"; + this.lblAttNoMatch.Size = new System.Drawing.Size(332, 69); + this.lblAttNoMatch.TabIndex = 7; + this.lblAttNoMatch.Text = "No attributes match current filter"; + this.lblAttNoMatch.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lblAttNoMatch.Visible = false; + // // gbAttributes // this.gbAttributes.Controls.Add(this.pnAttSearch); @@ -813,6 +838,7 @@ private void InitializeComponent() // // pnAttSystem // + this.pnAttSystem.Controls.Add(this.chkAttInternal); this.pnAttSystem.Controls.Add(this.chkAttLogical); this.pnAttSystem.Controls.Add(this.label15); this.pnAttSystem.Controls.Add(this.chkAttPrimaryAttribute); @@ -828,9 +854,9 @@ private void InitializeComponent() this.chkAttLogical.AutoSize = true; this.chkAttLogical.Location = new System.Drawing.Point(218, 5); this.chkAttLogical.Name = "chkAttLogical"; - this.chkAttLogical.Size = new System.Drawing.Size(107, 17); + this.chkAttLogical.Size = new System.Drawing.Size(60, 17); this.chkAttLogical.TabIndex = 3; - this.chkAttLogical.Text = "Logical Attributes"; + this.chkAttLogical.Text = "Logical"; this.chkAttLogical.UseVisualStyleBackColor = true; this.chkAttLogical.CheckedChanged += new System.EventHandler(this.filter_attribute_Changed); // @@ -1070,6 +1096,40 @@ private void InitializeComponent() this.gridRelationships.TabIndex = 2; this.gridRelationships.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grid_CellClick); // + // statusRelationships + // + this.statusRelationships.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.statusRelationshipsShowing, + this.statusRelationshipsSelected}); + this.statusRelationships.Location = new System.Drawing.Point(0, 524); + this.statusRelationships.Name = "statusRelationships"; + this.statusRelationships.Size = new System.Drawing.Size(341, 22); + this.statusRelationships.SizingGrip = false; + this.statusRelationships.TabIndex = 5; + this.statusRelationships.Text = "statusStrip1"; + // + // statusRelationshipsShowing + // + this.statusRelationshipsShowing.Name = "statusRelationshipsShowing"; + this.statusRelationshipsShowing.Size = new System.Drawing.Size(144, 17); + this.statusRelationshipsShowing.Text = "Select an entity to the left!"; + // + // statusRelationshipsSelected + // + this.statusRelationshipsSelected.Name = "statusRelationshipsSelected"; + this.statusRelationshipsSelected.Size = new System.Drawing.Size(0, 17); + // + // lblRelNoMatch + // + this.lblRelNoMatch.Dock = System.Windows.Forms.DockStyle.Top; + this.lblRelNoMatch.Location = new System.Drawing.Point(0, 174); + this.lblRelNoMatch.Name = "lblRelNoMatch"; + this.lblRelNoMatch.Size = new System.Drawing.Size(341, 69); + this.lblRelNoMatch.TabIndex = 6; + this.lblRelNoMatch.Text = "No relationships match current filter"; + this.lblRelNoMatch.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.lblRelNoMatch.Visible = false; + // // gbRelationships // this.gbRelationships.Controls.Add(this.panRelSearch); @@ -1382,29 +1442,6 @@ private void InitializeComponent() this.llRelationshipExpander.Text = "Hide filter"; this.llRelationshipExpander.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.llGroupBoxExpander_LinkClicked); // - // statusRelationships - // - this.statusRelationships.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.statusRelationshipsShowing, - this.statusRelationshipsSelected}); - this.statusRelationships.Location = new System.Drawing.Point(0, 524); - this.statusRelationships.Name = "statusRelationships"; - this.statusRelationships.Size = new System.Drawing.Size(341, 22); - this.statusRelationships.SizingGrip = false; - this.statusRelationships.TabIndex = 5; - this.statusRelationships.Text = "statusStrip1"; - // - // statusRelationshipsShowing - // - this.statusRelationshipsShowing.Name = "statusRelationshipsShowing"; - this.statusRelationshipsShowing.Size = new System.Drawing.Size(144, 17); - this.statusRelationshipsShowing.Text = "Select an entity to the left!"; - // - // statusRelationshipsSelected - // - this.statusRelationshipsSelected.Name = "statusRelationshipsSelected"; - this.statusRelationshipsSelected.Size = new System.Drawing.Size(0, 17); - // // tmEntSearch // this.tmEntSearch.Interval = 500; @@ -1428,38 +1465,26 @@ private void InitializeComponent() this.tmRelSearch.Interval = 500; this.tmRelSearch.Tick += new System.EventHandler(this.tmRelSearch_Tick); // - // lblRelNoMatch + // label10 // - this.lblRelNoMatch.Dock = System.Windows.Forms.DockStyle.Top; - this.lblRelNoMatch.Location = new System.Drawing.Point(0, 174); - this.lblRelNoMatch.Name = "lblRelNoMatch"; - this.lblRelNoMatch.Size = new System.Drawing.Size(341, 69); - this.lblRelNoMatch.TabIndex = 6; - this.lblRelNoMatch.Text = "No relationships match current filter"; - this.lblRelNoMatch.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.lblRelNoMatch.Visible = false; - // - // lblAttNoMatch - // - this.lblAttNoMatch.Dock = System.Windows.Forms.DockStyle.Top; - this.lblAttNoMatch.Location = new System.Drawing.Point(0, 148); - this.lblAttNoMatch.Name = "lblAttNoMatch"; - this.lblAttNoMatch.Size = new System.Drawing.Size(332, 69); - this.lblAttNoMatch.TabIndex = 7; - this.lblAttNoMatch.Text = "No attributes match current filter"; - this.lblAttNoMatch.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.lblAttNoMatch.Visible = false; + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(12, 6); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(42, 13); + this.label10.TabIndex = 3; + this.label10.Text = "Include"; // - // lblEntNoMatch + // chkAttInternal // - this.lblEntNoMatch.Dock = System.Windows.Forms.DockStyle.Top; - this.lblEntNoMatch.Location = new System.Drawing.Point(0, 148); - this.lblEntNoMatch.Name = "lblEntNoMatch"; - this.lblEntNoMatch.Size = new System.Drawing.Size(347, 69); - this.lblEntNoMatch.TabIndex = 8; - this.lblEntNoMatch.Text = "No entities match current filter"; - this.lblEntNoMatch.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.lblEntNoMatch.Visible = false; + this.chkAttInternal.AutoSize = true; + this.chkAttInternal.Location = new System.Drawing.Point(284, 5); + this.chkAttInternal.Name = "chkAttInternal"; + this.chkAttInternal.Size = new System.Drawing.Size(61, 17); + this.chkAttInternal.TabIndex = 4; + this.chkAttInternal.Text = "Internal"; + this.toolTip1.SetToolTip(this.chkAttInternal, "Standard attributes that are always created but perhaps not used"); + this.chkAttInternal.UseVisualStyleBackColor = true; + this.chkAttInternal.CheckedChanged += new System.EventHandler(this.filter_attribute_Changed); // // LCG // @@ -1486,6 +1511,8 @@ private void InitializeComponent() this.pnEntityGrid.ResumeLayout(false); this.pnEntityGrid.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.gridEntities)).EndInit(); + this.statusEntities.ResumeLayout(false); + this.statusEntities.PerformLayout(); this.gbEntities.ResumeLayout(false); this.gbEntities.PerformLayout(); this.pnEntSearch.ResumeLayout(false); @@ -1498,8 +1525,6 @@ private void InitializeComponent() this.pnEntCustom.PerformLayout(); this.pnEntSolution.ResumeLayout(false); this.pnEntSolution.PerformLayout(); - this.statusEntities.ResumeLayout(false); - this.statusEntities.PerformLayout(); this.splitContainer2.Panel1.ResumeLayout(false); this.splitContainer2.Panel1.PerformLayout(); this.splitContainer2.Panel2.ResumeLayout(false); @@ -1526,6 +1551,8 @@ private void InitializeComponent() this.pnRelationshipGrid.ResumeLayout(false); this.pnRelationshipGrid.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.gridRelationships)).EndInit(); + this.statusRelationships.ResumeLayout(false); + this.statusRelationships.PerformLayout(); this.gbRelationships.ResumeLayout(false); this.gbRelationships.PerformLayout(); this.panRelSearch.ResumeLayout(false); @@ -1540,8 +1567,6 @@ private void InitializeComponent() this.panRel2.PerformLayout(); this.panRel1.ResumeLayout(false); this.panRel1.PerformLayout(); - this.statusRelationships.ResumeLayout(false); - this.statusRelationships.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1660,5 +1685,7 @@ private void InitializeComponent() private System.Windows.Forms.Label lblEntNoMatch; private System.Windows.Forms.Label lblAttNoMatch; private System.Windows.Forms.Label lblRelNoMatch; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.CheckBox chkAttInternal; } } diff --git a/LCG-UDG/LCG.resx b/LCG-UDG/LCG.resx index 20db63b..a5172d2 100644 --- a/LCG-UDG/LCG.resx +++ b/LCG-UDG/LCG.resx @@ -180,6 +180,37 @@ /pHmsqjMe2ka/zpwXkG9UIdFB265btLCcaN08omRHqvvSPfQIo1dgvXSjn1en62os1bdogxVNVdlUZlX K/461AGuTFKdoNpN9bRaOCvMVNfqmXqnvlHfvsWh/3eoTNQg1cstyDYkl75Gda2eqXf/8bdF5C+/gS+F l8L9WQAAAABJRU5ErkJggg== + + + + + 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 @@ -241,95 +272,64 @@ tuXJMmwFBbk2qVRqS0lJsSUnJ9sSExNt4cH/tLGV8d3MM5H4iEjoYi4hCjb3rm8oZhixhAv44BIX4m/E HiKB4BkkEUeJT/8H/Df+n0SCP8OJI7YSPsRdxM/jt8T9hDPhRvDlrSR4Hf8f/D8rCP4Mx5VYTMxnjM35 L5ZJUltpUXybAAAAAElFTkSuQmCC - - - - - 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 - Mv86PmnY2wAAAABJRU5ErkJggg== + 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 + Cf8r4etBNQAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASYSURBVEhLrZYNTJVVHMafC5ePi3SFq6BcwCsKKBdR0QhB - 56w0JSdmmNXcbCtxNmvaZiomam5+VH41tcUUhjJtijBIBcmZstXmakkrZ+ncaOhdy0JSU5nA+/ScCy6N - InL+t2f3Pefd+T3///l6L4oD4HsHmAggXLJJjzaK7KjYa8eV7EA8q2Zf6dGabAxE3ppwm1USivPDgCfV - 1a0SdrYfzniIsj7oQNOPMxJYFIwv+gEZ6nZ0vgV8cXi5IRY/FLuQqWYf6X8bBe4Lweaf5g7nhekeftgH - 1UFAqvpDmlyI/SYKzTdWZfK8B82b+uM19bukADOwt2F7LwhjTrmDOlgxm2XZ/a2tTuxRf+LFaNRcWzKa - 3DuVbflu+lKDWsvc0J7AAMluBvc2QmsdqL++djxZksMD6U6rNgJ1VeMjLVa/QL4ZTy6Jp7V8KE9PCLNO - JuDjUGCQxqnY3oWt3ImFF6e4yRUp5PvZvJQZwY79ueTaNHJxHLl0MLlyCLney9ZcF88m44g3GF6NDelE - dIsH12qGyj4ThWvcqirmuchtWeTup5R9LPm24AWCFyaS64bR2jaS1vxBbErB189HYryGh0l+YGsOctqn - 4Zweo6QHzO31/VDS/IYyfj2GXCSwpsUPN5mvTvbDuVEVfpBK7kqXoZe/pqNxSTxm6gBF3H4aBefmONob - c9Am3ouS20/uCtthFyZXZjgtvusl3xrUCS8cSmvFUE3N8L/g20eSO2VQPJbckc7bmWjxZeBEw4Ioi/Xj - 2DjVb7BeSvST74uwCzH4/m6hqlgu+Ookti2K53UPaK1RBVvUb+Am+6Ix5B497xtBlup3s941zCSr4+mb - grtibZOS/dT7IuCrWKy8NltTtCaJHcsSeDkZ14tj8Vl7viraOUpwbdt78FJVU6ZpO6C1qZFpjSqvGMiW - Z3BHLGOgy+FvscGJxJ9T7a3c4KUvJuDuEw6UDQzEjkZPcBvLJwtupsbABTPwTzR9h1RthXZalRIrj2JL - jt9gq9TdQBF8OQlV9emB1jwX9qu9XZp1JQWfs0S7qkRV/BO8WvCaAeTBSLZM79nAdtSDaaUe7NTzBilP - cp9JwwLma1edmCJ4UhfcQ1Z2wY9Gk8e1vQ852TKzZwMT5lIbJU2S4iT7pdG69MbB4ndzycPaTeX34AMF - j+qEn+yrd2G9MjCHxtyo4WN1HbRmYdU5r6OdddNUwQSBlX2lzsmngh/rgp8Q/HQfrUPI/QbddtED4YtB - WPsEVDDPQdY+rsE6cFXK/KjgxzQtxzUtdSZzZyf8dKjadt6chT80/L8NbmYh+vcslF4dh29bJuHO2VlB - FufLrCBcZ+IxrYWyLtfzEcHrQmRkJ0/ZeGs2bmj4FqlnA4W592Ok54KBgrRwbHnFjd0fpaDiyyycuZqD - 387Os1lcGqCDJu23kfXgrZf8BpulJKnHMGthLixzcQ2WzO2ZLeVKr8p9WZwDm3JjsGvdCByonYiTl/PQ - 2DwHv+j9JqnbVfFvYYyMAiV9Cvx/DqKleMnsFPOZnSrNlRZLhdJCyezAh457pmYaNYP+Pwv9pVgpQRIc - IX8C84F4th4X4loAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASZSURBVEhLrZYNTJVVHMafC5ePi3SFq6BcwCsKKBe/0AxB + 57Q0JCdkmOXcbCt1NmvaZiomam5+VIo2teUUhjpsitcgFSRnylabq6mtnKVzo6l3LQtJTWUC79NzLrg0 + isj5357d95x35/f8/+frvSgJgv8dYCyASMkmPd7Ybodvlx1Xs4PxnJrdpcdrsi4YBSsjbVZpOM4PAMar + q0MlbGs/mnE/Zb3Pgcs/Tkni9lB82QMYqW5H21vAn4AZZ+PxQ4kLmWp2k/63UfDuMGz4aeZAXpjs4Yfd + UBUCpKs/7LIL8adj0HBzeSbPe9CwvideU79LCjIDuxq290Iw/IQ7pJW+adyd3dMqdmKn+pMvxqL6+sJh + 5K4cNs9x058e0rTHDe0J9JLsZnBXI7zGgbobq0aTpbksz3BaNVGo/XR0tMWqF8k3E8mFibSW9OeJMRHW + 8SR8HA700TgV27WwVTgx7+JEN7k0jXw/m5cyo9hankeuGkwuSCAX9SWX9SPXeNmU5+KZVBzyhsKrsWFt + iA7x8FpNUdmnYnCdxapilovclEXueFrZx5NvC14oeFEyuXoArU1DaM3uw8tp+OaFaIzW8AgpAGzKRW7L + JJzTY4z0kLm9rgdKG95Qxq/HkfMF1rQE4CbzFakBONepwg/SyW0ZMvTy1wzUL0xEvg5Q1J1nUHhuuqOl + PhfN4r0kuQPk9rAdcGGCb6TT4rte8q0+bfCi/rSW9tfUDPwLvnkIuVUGJSPILRm8k4lG/0gcOzM3xmLd + KNbnBAzWSMkB8gMRcSEO398rUhVLBF+Rwub5ibzhAa2VqmCj+g3cZL99OLlTz7sHkWX63aB3Z/PJqkT6 + J+KeWJuk1AD1gQj6Oh7Lrk/TFK1MYeviJF5JxY2SeHzeMkcVbR0quLbtfXiZqtmjadurtamWabUq9/Vm + 47O4K5Yx0OXwt1jrRPLP6fYmrvXSHxd07ykH9vQOxpZ6T2gzKyYIbqbGwAUz8E80fftVrU87rVKJVcSw + MTdgUCx1NFCEXklB5cmMYGuWC+Vqb5amXk3DFyzVripVFf8ErxK8uhe5L5qNkzs3sB32YFKZB1v1vFYq + kNynBmMu52hXHZsoeEo73EMebIcfjiWPanvvd7Ixv3MDE+ZSGyqNkxIk+6VhmHFmFCx+N5M8oN1UcR/e + W/CYNvjx7noX0SUDc2jMjRo5QtdBUxaWn/M6Wlg7SRWMEVjZH9Q5+UzwI+3wY4Kf7KZ1CHvQoMMueij8 + cYhoGQMfCxxkzZMarANXqcwPC35E03JU01JrMne2wU+Gq23nran4Q8P/2+BWFmJ/z0LZtVH4tnEc7p6e + GmJxtswKI3UmntBaKOsKPR8SvDZMRnbyhI23p+Gmhm+UOjdQmHs/Tno+FCgcHImNr7ix46M0+L7Kwqlr + ufjt9CybxUVBOmhSuY2sA2+/HDDYIKVInYZZC3NhmYurr2Ruz2wpT3pV7osTHFifF4dtqwdhb81YHL9S + gPqG6fhF79dLHa6KfwtjZBQs6VMQ+HMQKyVKZqeYz2yONFNaIBVJ8ySzAx857puaadQMBv4s9JTipSRJ + cIT9CcSHeKypL2+/AAAAAElFTkSuQmCC @@ -356,12 +356,12 @@ 263, 17 - - 682, 17 - 585, 17 + + 682, 17 + 379, 17 diff --git a/LCG-UDG/Settings/CommonSettings.cs b/LCG-UDG/Settings/CommonSettings.cs index 0d626b2..c2eaa00 100644 --- a/LCG-UDG/Settings/CommonSettings.cs +++ b/LCG-UDG/Settings/CommonSettings.cs @@ -1,4 +1,6 @@ -namespace Rappen.XTB.LCG +using System.Collections.Generic; + +namespace Rappen.XTB.LCG { public class CommonSettings { @@ -13,6 +15,23 @@ public CommonSettings(bool isUML) } } + internal void MigrateFromOldConfig(bool isUML) + { + if (CamelCaseWords == null || CamelCaseWords.Length == 0) + { + CamelCaseWords = new CommonSettings(isUML).CamelCaseWords; + } + if (CamelCaseWordEnds == null || CamelCaseWordEnds.Length == 0) + { + CamelCaseWordEnds = new CommonSettings(isUML).CamelCaseWordEnds; + } + if (Template.TemplateVersion != new Template(isUML).TemplateVersion) + { + //MessageBox.Show("Template has been updated.\nAny customizations will need to be recreated.", "Template", MessageBoxButtons.OK, MessageBoxIcon.Information); + Template = new Template(isUML); + } + } + internal void SetFixedValues(bool isUML) { if (isUML) @@ -36,8 +55,9 @@ internal void SetFixedValues(bool isUML) public string ManyManyRelationshipPrefix { get; set; } = "RelMM_"; public string OptionSetEnumPrefix { get; set; } = string.Empty; public string OptionSetEnumSuffix { get; set; } = "_OptionSet"; - public string CamelCaseWords { get; set; } = "parent, customer, owner, state, status, name, phone, address, code, postal, mail, modified, created, type, method, verson, number, first, last, middle, contact, account, system, user, fullname, preferred, processing, annual, plugin, step, key, details, message, description, constructor, execution, secure, configuration, behalf, count, percent, internal, external, trace, entity, primary, secondary, lastused, credit, credited, donot, exchange, import, invoke, invoked, private, market, marketing, revenue, business, price, level, pricelevel, territory, version, conversion, workorder, team"; - public string CamelCaseWordEnds { get; set; } = "id"; + public string[] CamelCaseWords { get; set; } = new string[] { "parent", "customer", "owner", "state", "status", "name", "phone", "address", "code", "postal", "mail", "modified", "created", "type", "method", "verson", "number", "first", "last", "middle", "contact", "account", "system", "user", "fullname", "preferred", "processing", "annual", "plugin", "step", "key", "details", "message", "description", "constructor", "execution", "secure", "configuration", "behalf", "count", "percent", "internal", "external", "trace", "entity", "primary", "secondary", "lastused", "credit", "credited", "donot", "exchange", "import", "invoke", "invoked", "private", "market", "marketing", "revenue", "business", "price", "level", "pricelevel", "territory", "version", "conversion", "workorder", "team" }; + public string[] CamelCaseWordEnds { get; set; } = new string[] { "id" }; + public string[] InternalAttributes { get; set; } = new string[] { "importsequencenumber", "owneridname", "owneridtype", "owneridyominame", "createdbyname", "createdbyyominame", "createdonbehalfby", "createdonbehalfbyname", "createdonbehalfbyyominame", "modifiedbyname", "modifiedbyyominame", "modifiedonbehalfby", "modifiedonbehalfbyname", "modifiedonbehalfbyyominame", "overriddencreatedon", "owningbusinessunit", "owningteam", "owninguser", "regardingobjectidname", "regardingobjectidyominame", "regardingobjecttypecode", "timezoneruleversionnumber", "transactioncurrencyidname", "utcconversiontimezonecode", "versionnumber" }; public Template Template { get; set; } } @@ -103,7 +123,7 @@ skinparam ClassBorderColor<> Blue // Filename : {filename} // Created : {createdate} // *********************************************************************"; - public string Legend { get; set; } + public string Legend { get; set; } public string DataContainer { get; set; } = "namespace {namespace}\n{\n{data}\n}"; public string EntityContainer { get; set; } = "{summary}\n{remarks}\npublic static class {entityname}\n{\n{entitydetail}\n{attributes}\n{relationships}\n{optionsets}\n}"; public string EntityDetail { get; set; } = "public const string EntityName = '{logicalname}';\npublic const string EntityCollectionName = '{logicalcollectionname}';"; diff --git a/LCG-UDG/Settings/Settings.cs b/LCG-UDG/Settings/Settings.cs index dfdc93d..c430293 100644 --- a/LCG-UDG/Settings/Settings.cs +++ b/LCG-UDG/Settings/Settings.cs @@ -106,6 +106,7 @@ public class AttributeFilter public bool PrimaryKey { get; set; } public bool PrimaryAttribute { get; set; } public bool Logical { get; set; } + public bool Internal { get; set; } } public class RelationshipFilter