Merge pull request #232 from FriendsOfCADability/ShowProperty_FixCS3005

Fix CS3005 for labelText and subEntries

Author: dsn27

CADability/CheckProperty.cs

@@ -86,7 +86,7 @@ private int CheckState
                     {
                         MethodInfo mi = propertyInfoSetBool;
                         object[] prm = new Object[2];
-                        prm[0] = labelText;
+                        prm[0] = labelTextInternal;
                         if (value == 1) prm[1] = true;
                         else prm[1] = false;
                         mi.Invoke(objectWithProperty, prm);
@@ -133,7 +133,7 @@ public override void ButtonClicked(PropertyEntryButton button)
                 if (cs != 2) cs = 1 - cs;
                 CheckState = cs;
                 propertyPage?.Refresh(this);
-                CheckStateChangedEvent?.Invoke(labelText, (
+                CheckStateChangedEvent?.Invoke(labelTextInternal, (
                     CheckState)cs);
             }
         }

CADability/IShowProperty.cs

@@ -275,7 +275,8 @@ public class IShowPropertyImpl : IShowProperty, IPropertyEntry
         /// Overrides the label text, which is normally retrieved from the <see cref="StringTable"/>
         /// with the <see cref="resourceId"/>
         /// </summary>
-        protected string labelText;
+        protected string labelTextInternal;
+        
         /// <summary>
         /// The resourceId specifies both the label text and the tooltip text. The label text
         /// is loaded from the <see cref="StringTable"/> with the ID resourceId+".Label" the 
@@ -423,19 +424,19 @@ public virtual void Select()
         }
         /// <summary>
         /// Implementation of <see cref="IShowProperty.LabelText"/>, returns either
-        /// <see cref="labelText"/> (if not null) or <see cref="StringTable.GetString"/>(resourceId+".Label")
-        /// Whe set, <see cref="labelText"/> is set.
+        /// <see cref="labelTextInternal"/> (if not null) or <see cref="StringTable.GetString"/>(resourceId+".Label")
+        /// Whe set, <see cref="labelTextInternal"/> is set.
         /// </summary>
         public virtual string LabelText
         {
             get
             {
-                if (labelText != null) return labelText;
+                if (labelTextInternal != null) return labelTextInternal;
                 return StringTable.GetString(resourceId + ".Label");
             }
             set
             {
-                labelText = value;
+                labelTextInternal = value;
             }
         }
         /// <summary>
@@ -805,7 +806,7 @@ protected void PropertyEntryChangedState(StateChangedArgs args)
 
         public virtual IPropertyEntry FindSubItem(string helpResourceID)
         {   // also check for LabeText, which would be the name of an item in the list
-            if (ResourceId == helpResourceID || (string.IsNullOrEmpty(ResourceId) && labelText == helpResourceID)) return this;
+            if (ResourceId == helpResourceID || (string.IsNullOrEmpty(ResourceId) && labelTextInternal == helpResourceID)) return this;
             for (int i = 0; i < SubItems.Length; i++)
             {
                 IPropertyEntry found = SubItems[i].FindSubItem(helpResourceID);
@@ -826,24 +827,24 @@ public class ShowPropertyGroup : PropertyEntryImpl
         public ShowPropertyGroup(string resourceId)
         {
             base.resourceId = resourceId;
-            subEntries = new IPropertyEntry[0];
+            subEntriesInternal = new IPropertyEntry[0];
         }
-        protected IPropertyEntry[] subEntries;
+        protected IPropertyEntry[] subEntriesInternal;
         public void ClearSubEntries()
         {
-            subEntries = new IPropertyEntry[0];
+            subEntriesInternal = new IPropertyEntry[0];
         }
         public void AddSubEntry(IPropertyEntry ToAdd)
         {
-            ArrayList al = new ArrayList(subEntries);
+            ArrayList al = new ArrayList(subEntriesInternal);
             al.Add(ToAdd);
-            subEntries = (IPropertyEntry[])al.ToArray(typeof(IPropertyEntry));
+            subEntriesInternal = (IPropertyEntry[])al.ToArray(typeof(IPropertyEntry));
         }
         public void AddSubEntries(params IPropertyEntry[] ToAdd)
         {
-            ArrayList al = new ArrayList(subEntries);
+            ArrayList al = new ArrayList(subEntriesInternal);
             al.AddRange(ToAdd);
-            subEntries = (IPropertyEntry[])al.ToArray(typeof(IPropertyEntry));
+            subEntriesInternal = (IPropertyEntry[])al.ToArray(typeof(IPropertyEntry));
         }
         public override PropertyEntryType Flags => PropertyEntryType.GroupTitle | PropertyEntryType.HasSubEntries;
         /// <summary>
@@ -854,7 +855,7 @@ public override IPropertyEntry[] SubItems
         {
             get
             {
-                return subEntries;
+                return subEntriesInternal;
             }
         }
 

CADability/PropertyEntryImpl.cs

@@ -8,7 +8,7 @@ namespace CADability.UserInterface
     public abstract class PropertyEntryImpl : IPropertyEntry, IShowProperty
     {
         protected string resourceId;
-        protected string labelText;
+        private string labelText;
         private IFrame frame;
         private readonly IShowPropertyImpl dumy = null; // will never be set. Dummy implementation of IShowProperty