CSLA - R - Group 1

2026-09-11 16:03:51 -04:00
parent d9f8f6cb37
commit d238d6aed2
33 changed files with 2101 additions and 4829 deletions
@@ -13,8 +13,6 @@ using System.Data;
 using System.Data.SqlClient;
 using Csla;
 using Csla.Data;
-using System.Configuration;
-using System.IO;
 using System.ComponentModel;
 using System.Collections.Generic;
 using Csla.Validation;
@@ -31,13 +29,10 @@ namespace VEPROMS.CSLA.Library
 		private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 		#endregion
 		#region Business Methods
-		private string _ErrorMessage = string.Empty;
-		public string ErrorMessage
-		{
-			get { return _ErrorMessage; }
-		}
-		// One To Many
-		public ROFstFigure this[Figure myFigure]
+		private readonly string _ErrorMessage = string.Empty;
+        public string ErrorMessage => _ErrorMessage;
+        // One To Many
+        public ROFstFigure this[Figure myFigure]
 		{
 			get
 			{
@@ -47,11 +42,8 @@ namespace VEPROMS.CSLA.Library
 				return null;
 			}
 		}
-		public new System.Collections.Generic.IList<ROFstFigure> Items
-		{
-			get { return base.Items; }
-		}
-		public ROFstFigure GetItem(Figure myFigure)
+        public new System.Collections.Generic.IList<ROFstFigure> Items => base.Items;
+        public ROFstFigure GetItem(Figure myFigure)
 		{
 			foreach (ROFstFigure figure in this)
 				if (figure.FigureID == myFigure.FigureID)
@@ -63,7 +55,7 @@ namespace VEPROMS.CSLA.Library
 			if (!Contains(myROImage))
 			{
 				ROFstFigure figure = ROFstFigure.New(myROImage);
-				this.Add(figure);
+				Add(figure);
 				return figure;
 			}
 			else
@@ -108,23 +100,20 @@ namespace VEPROMS.CSLA.Library
 					return true;
 			return false;
 		}
-		public override bool IsValid
+        public override bool IsValid => IsValidList(new List<object>());
+        public bool IsValidList(List<object> list)
 		{
-			get { return IsValidList(new List<object>()); }
-		}
-		public bool IsValidList(List<object> list)
-    {
-      // run through all the child objects
-      // and if any are invalid then the
-      // collection is invalid
-      foreach (ROFstFigure child in this)
-				if (!child.IsValidList(list))
-				{
-					//Console.WriteLine("Valid {0} Child {1} - {2}", child.IsValid, child.GetType().Name,child.ToString());
-					return false;
-				}
-       return true;
-     }
+		  // run through all the child objects
+		  // and if any are invalid then the
+		  // collection is invalid
+		  foreach (ROFstFigure child in this)
+					if (!child.IsValidList(list))
+					{
+						//Console.WriteLine("Valid {0} Child {1} - {2}", child.IsValid, child.GetType().Name,child.ToString());
+						return false;
+					}
+		   return true;
+		 }
 		public bool Contains(ROImage myROImage)
 		{
 			foreach (ROFstFigure figure in this)
@@ -156,20 +145,14 @@ namespace VEPROMS.CSLA.Library
 			get
 			{
 				IVEHasBrokenRules hasBrokenRules = HasBrokenRules;
-				return (hasBrokenRules != null ? hasBrokenRules.BrokenRules : null);
+				return hasBrokenRules?.BrokenRules;
 			}
 		}
-		#endregion
-		#region Factory Methods
-		internal static ROFstFigures New()
-		{
-			return new ROFstFigures();
-		}
-		internal static ROFstFigures Get(SafeDataReader dr)
-		{
-			return new ROFstFigures(dr);
-		}
-		public static ROFstFigures GetByROFstID(int rOFstID)
+        #endregion
+        #region Factory Methods
+        internal static ROFstFigures New() => new ROFstFigures();
+        internal static ROFstFigures Get(SafeDataReader dr) => new ROFstFigures(dr);
+        public static ROFstFigures GetByROFstID(int rOFstID)
 		{
 			try
 			{
@@ -180,11 +163,8 @@ namespace VEPROMS.CSLA.Library
 				throw new DbCslaException("Error on ROFstFigures.GetByROFstID", ex);
 			}
 		}
-		private ROFstFigures()
-		{
-			MarkAsChild();
-		}
-		internal ROFstFigures(SafeDataReader dr)
+        private ROFstFigures() => MarkAsChild();
+        internal ROFstFigures(SafeDataReader dr)
 		{
 			MarkAsChild();
 			Fetch(dr);
@@ -193,16 +173,12 @@ namespace VEPROMS.CSLA.Library
 		private static int _CountCreated = 0;
 		private static int _CountDisposed = 0;
 		private static int _CountFinalized = 0;
-		private static int IncrementCountCreated
-		{ get { return ++_CountCreated; } }
-		private int _CountWhenCreated = IncrementCountCreated;
-		public static int CountCreated
-		{ get { return _CountCreated; } }
-		public static int CountNotDisposed
-		{ get { return _CountCreated - _CountDisposed; } }
-		public static int CountNotFinalized
-		{ get { return _CountCreated - _CountFinalized; } }
-		~ROFstFigures()
+        private static int IncrementCountCreated => ++_CountCreated;
+        private readonly int _CountWhenCreated = IncrementCountCreated;
+        public static int CountCreated => _CountCreated;
+        public static int CountNotDisposed => _CountCreated - _CountDisposed;
+        public static int CountNotFinalized => _CountCreated - _CountFinalized;
+        ~ROFstFigures()
 		{
 			_CountFinalized++;
 		}
@@ -217,19 +193,16 @@ namespace VEPROMS.CSLA.Library
 		// called to load data from the database
 		private void Fetch(SafeDataReader dr)
 		{
-			this.RaiseListChangedEvents = false;
+			RaiseListChangedEvents = false;
 			while (dr.Read())
-				this.Add(ROFstFigure.Get(dr));
-			this.RaiseListChangedEvents = true;
+				Add(ROFstFigure.Get(dr));
+			RaiseListChangedEvents = true;
 		}
 		[Serializable()]
 		private class ROFstIDCriteria
 		{
-			public ROFstIDCriteria(int rOFstID)
-			{
-				_ROFstID = rOFstID;
-			}
-			private int _ROFstID;
+            public ROFstIDCriteria(int rOFstID) => _ROFstID = rOFstID;
+            private int _ROFstID;
 			public int ROFstID
 			{
 				get { return _ROFstID; }
@@ -238,7 +211,7 @@ namespace VEPROMS.CSLA.Library
 		}
 		private void DataPortal_Fetch(ROFstIDCriteria criteria)
 		{
-			this.RaiseListChangedEvents = false;
+			RaiseListChangedEvents = false;
 			if (_MyLog.IsDebugEnabled) _MyLog.DebugFormat("[{0}] ROFstFigures.DataPortal_FetchROFstID", GetHashCode());
 			try
 			{
@@ -252,7 +225,7 @@ namespace VEPROMS.CSLA.Library
 						cm.CommandTimeout = Database.DefaultTimeout;
 						using (SafeDataReader dr = new SafeDataReader(cm.ExecuteReader()))
 						{
-							while (dr.Read()) this.Add(new ROFstFigure(dr));
+							while (dr.Read()) Add(new ROFstFigure(dr));
 						}
 					}
 				}
@@ -262,11 +235,11 @@ namespace VEPROMS.CSLA.Library
 				if (_MyLog.IsErrorEnabled) _MyLog.Error("ROFstFigures.DataPortal_FetchROFstID", ex);
 				throw new DbCslaException("ROFstFigures.DataPortal_Fetch", ex);
 			}
-			this.RaiseListChangedEvents = true;
+			RaiseListChangedEvents = true;
 		}
 		internal void Update(ROFst rOFst)
 		{
-			this.RaiseListChangedEvents = false;
+			RaiseListChangedEvents = false;
 			try
 			{
 				// update (thus deleting) any deleted child objects
@@ -285,49 +258,38 @@ namespace VEPROMS.CSLA.Library
 			}
 			finally
 			{
-				this.RaiseListChangedEvents = true;
+				RaiseListChangedEvents = true;
 			}
 		}
-		#endregion
-		#region ICustomTypeDescriptor impl
-		public String GetClassName()
-		{ return TypeDescriptor.GetClassName(this, true); }
-		public AttributeCollection GetAttributes()
-		{ return TypeDescriptor.GetAttributes(this, true); }
-		public String GetComponentName()
-		{ return TypeDescriptor.GetComponentName(this, true); }
-		public TypeConverter GetConverter()
-		{ return TypeDescriptor.GetConverter(this, true); }
-		public EventDescriptor GetDefaultEvent()
-		{ return TypeDescriptor.GetDefaultEvent(this, true); }
-		public PropertyDescriptor GetDefaultProperty()
-		{ return TypeDescriptor.GetDefaultProperty(this, true); }
-		public object GetEditor(Type editorBaseType)
-		{ return TypeDescriptor.GetEditor(this, editorBaseType, true); }
-		public EventDescriptorCollection GetEvents(Attribute[] attributes)
-		{ return TypeDescriptor.GetEvents(this, attributes, true); }
-		public EventDescriptorCollection GetEvents()
-		{ return TypeDescriptor.GetEvents(this, true); }
-		public object GetPropertyOwner(PropertyDescriptor pd)
-		{ return this; }
-		/// <summary>
-		/// Called to get the properties of this type. Returns properties with certain
-		/// attributes. this restriction is not implemented here.
-		/// </summary>
-		/// <param name="attributes"></param>
-		/// <returns></returns>
-		public PropertyDescriptorCollection GetProperties(Attribute[] attributes)
-		{ return GetProperties(); }
-		/// <summary>
-		/// Called to get the properties of this type.
-		/// </summary>
-		/// <returns></returns>
-		public PropertyDescriptorCollection GetProperties()
+        #endregion
+        #region ICustomTypeDescriptor impl
+        public string GetClassName() => TypeDescriptor.GetClassName(this, true);
+        public AttributeCollection GetAttributes() => TypeDescriptor.GetAttributes(this, true);
+        public string GetComponentName() => TypeDescriptor.GetComponentName(this, true);
+        public TypeConverter GetConverter() => TypeDescriptor.GetConverter(this, true);
+        public EventDescriptor GetDefaultEvent() => TypeDescriptor.GetDefaultEvent(this, true);
+        public PropertyDescriptor GetDefaultProperty() => TypeDescriptor.GetDefaultProperty(this, true);
+        public object GetEditor(Type editorBaseType) => TypeDescriptor.GetEditor(this, editorBaseType, true);
+        public EventDescriptorCollection GetEvents(Attribute[] attributes) => TypeDescriptor.GetEvents(this, attributes, true);
+        public EventDescriptorCollection GetEvents() => TypeDescriptor.GetEvents(this, true);
+        public object GetPropertyOwner(PropertyDescriptor pd) => this;
+        /// <summary>
+        /// Called to get the properties of this type. Returns properties with certain
+        /// attributes. this restriction is not implemented here.
+        /// </summary>
+        /// <param name="attributes"></param>
+        /// <returns></returns>
+        public PropertyDescriptorCollection GetProperties(Attribute[] attributes) => GetProperties();
+        /// <summary>
+        /// Called to get the properties of this type.
+        /// </summary>
+        /// <returns></returns>
+        public PropertyDescriptorCollection GetProperties()
 		{
 			// Create a collection object to hold property descriptors
 			PropertyDescriptorCollection pds = new PropertyDescriptorCollection(null);
 			// Iterate the list 
-			for (int i = 0; i < this.Items.Count; i++)
+			for (int i = 0; i < Items.Count; i++)
 			{
 				// Create a property descriptor for the item and add to the property descriptor collection
 				ROFstFiguresPropertyDescriptor pd = new ROFstFiguresPropertyDescriptor(this, i);
@@ -344,7 +306,6 @@ namespace VEPROMS.CSLA.Library
 	/// </summary>
 	public partial class ROFstFiguresPropertyDescriptor : vlnListPropertyDescriptor
 	{
-		private ROFstFigure Item { get { return (ROFstFigure)_Item; } }
 		public ROFstFiguresPropertyDescriptor(ROFstFigures collection, int index) : base(collection, index) { ;}
 	}
 	#endregion
@@ -353,10 +314,10 @@ namespace VEPROMS.CSLA.Library
 	{
 		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destType)
 		{
-			if (destType == typeof(string) && value is ROFstFigures)
+			if (destType == typeof(string) && value is ROFstFigures figures)
 			{
 				// Return department and department role separated by comma.
-				return ((ROFstFigures)value).Items.Count.ToString() + " Figures";
+				return $"{figures.Items.Count} Figures";
 			}
 			return base.ConvertTo(context, culture, value, destType);
 		}