Refactor Charter code

Web/Charter/CurveData.cs

@@ -6,62 +6,54 @@ namespace LeafWeb.Web.Charter
 	[Serializable]
 	public class CurveData
 	{
-		private readonly String curveID;
-		private readonly CurveParamSet paramSet1;
-		private readonly CurveParamSet paramSet2;
-		private readonly CurveParamSet paramSet3;
-		private readonly CurveParamSet paramSet4;
-
-		public CurveData()
-		{
-		}
+		private readonly String _curveId;
+		private readonly CurveParamSet _paramSet1;
+		private readonly CurveParamSet _paramSet2;
+		private readonly CurveParamSet _paramSet3;
+		private readonly CurveParamSet _paramSet4;
 
 		public CurveData(StreamReader sr, ref String errMsg, ref int lineNbr)
 		{
 			// For each curve in the output file there are four sets of data.
 
-			paramSet1 = new CurveParamSet(sr, ref errMsg, ref lineNbr, ref curveID);
+			_paramSet1 = new CurveParamSet(sr, ref errMsg, ref lineNbr, ref _curveId);
 			if (errMsg.Length > 0)
 				return;
 
-			paramSet2 = new CurveParamSet(sr, ref errMsg, ref lineNbr, ref curveID);
+			_paramSet2 = new CurveParamSet(sr, ref errMsg, ref lineNbr, ref _curveId);
 			if (errMsg.Length > 0)
 				return;
 
-			paramSet3 = new CurveParamSet(sr, ref errMsg, ref lineNbr, ref curveID);
+			_paramSet3 = new CurveParamSet(sr, ref errMsg, ref lineNbr, ref _curveId);
 			if (errMsg.Length > 0)
 				return;
 
-			paramSet4 = new CurveParamSet(sr, ref errMsg, ref lineNbr, ref curveID);
-			if (errMsg.Length > 0)
-				return;
-
-			return;
+			_paramSet4 = new CurveParamSet(sr, ref errMsg, ref lineNbr, ref _curveId);
 		}
 
-		public String getCurveID()
+		public String GetCurveId()
 		{
-			return curveID;
+			return _curveId;
 		}
 
-		public CurveParamSet getParamSet1()
+		public CurveParamSet GetParamSet1()
 		{
-			return paramSet1;
+			return _paramSet1;
 		}
 
-		public CurveParamSet getParamSet2()
+		public CurveParamSet GetParamSet2()
 		{
-			return paramSet2;
+			return _paramSet2;
 		}
 
-		public CurveParamSet getParamSet3()
+		public CurveParamSet GetParamSet3()
 		{
-			return paramSet3;
+			return _paramSet3;
 		}
 
-		public CurveParamSet getParamSet4()
+		public CurveParamSet GetParamSet4()
 		{
-			return paramSet4;
+			return _paramSet4;
 		}
 	}
 }