refactoring in StringProcesserFormatter from @andymac-2

Author: JonnyOThan

RasterPropMonitor/Auxiliary modules/JSILabel.cs

@@ -230,7 +230,7 @@ public void Start()
 
                     if (oneshot)
                     {
-                        textObj.text = labels[0].Get();
+                        textObj.text = labels[0].GetFormattedString();
 
                         var propBatcher = internalModel.GetComponentInChildren<PropBatcher>();
                         if (propBatcher != null && canBatch)
@@ -338,7 +338,7 @@ public void Click()
                 activeLabel = 0;
             }
 
-            textObj.text = labels[activeLabel].Get();
+            textObj.text = labels[activeLabel].GetFormattedString();
 
             // do we need to activate the update loop?
             if (labels.Count > 1 && !labels[activeLabel].IsConstant)
@@ -492,7 +492,7 @@ public override void OnUpdate()
 
             if (UpdateCheck() && JUtil.RasterPropMonitorShouldUpdate(part))
             {
-                textObj.text = labels[activeLabel].Get();
+                textObj.text = labels[activeLabel].GetFormattedString();
             }
         }
     }

RasterPropMonitor/Auxiliary modules/JSISwitchableVariableLabel.cs

@@ -190,7 +190,7 @@ public override void OnUpdate()
         {
             if (UpdateCheck())
             {
-                textObj.text.text = StringProcessor.ProcessString(labelsEx[activeLabel].label, rpmComp);
+                textObj.text.text = labelsEx[activeLabel].label.GetFormattedString();
 
                 if (labelsEx[activeLabel].oneShot)
                 {
@@ -232,7 +232,7 @@ void UpdateActiveLabel(int direction)
 
             if (labelsEx[activeLabel].hasText)
             {
-                textObj.text.text = StringProcessor.ProcessString(labelsEx[activeLabel].label, rpmComp);
+                textObj.text.text = labelsEx[activeLabel].label.GetFormattedString();
             }
 
             // Force an update.

RasterPropMonitor/Auxiliary modules/JSIVariableLabel.cs

@@ -190,7 +190,7 @@ public override void OnUpdate()
 
             if (UpdateCheck())
             {
-                textObj.text.text = StringProcessor.ProcessString(spf, rpmComp);
+                textObj.text.text = spf.GetFormattedString();
                 oneshotComplete = true;
             }
         }

RasterPropMonitor/Core/MonitorPage.cs

@@ -156,7 +156,7 @@ public void UpdateText(RasterPropMonitorComputer rpmComp)
                         {
                             if (spf[i] != null)
                             {
-                                outputLines[i] = StringProcessor.ProcessString(spf[i], rpmComp);
+                                outputLines[i] = spf[i].GetFormattedString();
                             }
                         }
                     }

RasterPropMonitor/Core/StringProcessor.cs

@@ -25,6 +25,8 @@ namespace JSI
 {
     public class StringProcessorFormatter
     {
+        internal static readonly SIFormatProvider fp = new SIFormatProvider();
+
         // The formatString or plain text (if usesComp is false).
         private readonly string formatString;
         // An array of source variables
@@ -69,7 +71,7 @@ public StringProcessorFormatter(string input, RasterPropMonitorComputer rpmComp)
                         sourceValues[i] = sourceVariables[i].Get();
                     }
 
-                    cachedResult = string.Format(StringProcessor.fp, formatString, sourceValues);
+                    cachedResult = string.Format(fp, formatString, sourceValues);
 
                     // if every variable is a constant, we can run the format once and cache the result
                     if (allVariablesConstant)
@@ -116,27 +118,14 @@ public bool UpdateValues()
             return anyChanged;
         }
 
-        public string Get()
+        public string GetFormattedString()
         {
             if (UpdateValues())
             {
-                cachedResult = string.Format(StringProcessor.fp, formatString, sourceValues);
+                cachedResult = string.Format(fp, formatString, sourceValues);
             }
 
             return cachedResult;
         }
     }
-
-    public static class StringProcessor
-    {
-        internal static readonly SIFormatProvider fp = new SIFormatProvider();
-
-        public static string ProcessString(StringProcessorFormatter formatter, RasterPropMonitorComputer rpmComp)
-        {
-            Profiler.BeginSample("ProcessString_cached");
-            string result = formatter.Get();
-            Profiler.EndSample();
-            return result;
-        }
-    }
 }