some OCS refactoring

Author: tomysshadow

FlashpointSecurePlayer/OldCPUSimulator.cs

@@ -43,9 +43,7 @@ public bool TestRunningWithOldCPUSimulator() {
             }
 
             if (parentProcessFileName != null) {
-                if (parentProcessFileName.Equals(OLD_CPU_SIMULATOR_PARENT_PROCESS_FILE_NAME, StringComparison.OrdinalIgnoreCase)) {
-                    return true;
-                }
+                return parentProcessFileName.Equals(OLD_CPU_SIMULATOR_PARENT_PROCESS_FILE_NAME, StringComparison.OrdinalIgnoreCase);
             }
             return false;
         }
@@ -141,8 +139,8 @@ public void Activate(string templateName, ref ProcessStartInfo softwareProcessSt
                 case ModeElement.NAME.SOFTWARE:
                 // USB the HDMI to .exe the database
                 string commandLineExpanded = Environment.ExpandEnvironmentVariables(modeElement.CommandLine);
-                StringBuilder oldCPUSimulatorSoftware = new StringBuilder();
                 string workingDirectory = null;
+                StringBuilder software = new StringBuilder();
 
                 // the problem we're dealing with here
                 // is that we need to get the full path to
@@ -159,14 +157,15 @@ public void Activate(string templateName, ref ProcessStartInfo softwareProcessSt
 
                     string fullPath = Path.GetFullPath(argv[0]);
                     workingDirectory = Path.GetDirectoryName(fullPath);
-                    oldCPUSimulatorSoftware.Append(GetValidArgument(fullPath, true));
+                    software.Append(GetValidArgument(fullPath, true));
                 } catch (Exception ex) {
                     LogExceptionToLauncher(ex);
                     throw new InvalidOldCPUSimulatorException("The command line is invalid.");
                 }
 
-                oldCPUSimulatorSoftware.Append(" ");
-                oldCPUSimulatorSoftware.Append(GetArgumentSliceFromCommandLine(commandLineExpanded, 1));
+                software.Append(" ");
+                software.Append(GetArgumentSliceFromCommandLine(commandLineExpanded, 1));
+
                 // this becomes effectively the new thing passed as --software
                 // the shared function is used both here and GUI side for restarts
                 //modeElement.CommandLine = OLD_CPU_SIMULATOR_PATH + " " + GetOldCPUSimulatorProcessStartInfoArguments(oldCPUSimulatorElement, oldCPUSimulatorSoftware.ToString());
@@ -177,7 +176,7 @@ public void Activate(string templateName, ref ProcessStartInfo softwareProcessSt
                 }
 
                 softwareProcessStartInfo.FileName = OLD_CPU_SIMULATOR_PATH;
-                softwareProcessStartInfo.Arguments = GetOldCPUSimulatorProcessStartInfoArguments(oldCPUSimulatorElement, oldCPUSimulatorSoftware).ToString();
+                softwareProcessStartInfo.Arguments = GetOldCPUSimulatorProcessStartInfoArguments(oldCPUSimulatorElement, software).ToString();
                 //softwareProcessStartInfo.RedirectStandardError = true;
                 softwareProcessStartInfo.RedirectStandardError = false;
                 softwareProcessStartInfo.RedirectStandardOutput = false;

FlashpointSecurePlayer/Shared.cs

@@ -3051,7 +3051,10 @@ public static string GetArgumentSliceFromCommandLine(string commandLine, int beg
             return argumentSlice;
         }
 
-        public static StringBuilder GetOldCPUSimulatorProcessStartInfoArguments(FlashpointSecurePlayerSection.TemplatesElementCollection.TemplateElement.ModificationsElement.OldCPUSimulatorElement oldCPUSimulatorElement, StringBuilder software) {
+        public static StringBuilder GetOldCPUSimulatorProcessStartInfoArguments(
+            FlashpointSecurePlayerSection.TemplatesElementCollection.TemplateElement.ModificationsElement.OldCPUSimulatorElement oldCPUSimulatorElement,
+            StringBuilder software
+        ) {
             StringBuilder oldCPUSimulatorProcessStartInfoArguments = new StringBuilder("-t ");
 
             if (!int.TryParse(Environment.ExpandEnvironmentVariables(oldCPUSimulatorElement.TargetRate), out int targetRate)) {