#1394 refactor rename to make things more readable

Author: jantje

io.sloeber.core/src/io/sloeber/core/api/SerialManager.java

@@ -36,14 +36,14 @@ public static void UnRegisterSerialUser() {
 		otherSerialUser = null;
 	}
 
-	public static boolean StopSerialMonitor(String mComPort) {
+	public static boolean pauzeSerialMonitor(String mComPort) {
 		if (otherSerialUser != null) {
 			return otherSerialUser.PauzePort(mComPort);
 		}
 		return false;
 	}
 
-	public static void StartSerialMonitor(String mComPort) {
+	public static void resumeSerialMonitor(String mComPort) {
 		if (otherSerialUser != null) {
 			otherSerialUser.ResumePort(mComPort);
 		}

io.sloeber.core/src/io/sloeber/core/toolchain/SloeberBuildRunner.java

@@ -54,10 +54,10 @@ public boolean invokeBuild(int kind, IProject project, IConfiguration configurat
             }
         }
 
-        boolean WeStoppedTheComPort = false;
+        boolean theComPortIsPauzed = false;
         if (!actualUploadPort.isBlank()) {
             try {
-                WeStoppedTheComPort = SerialManager.StopSerialMonitor(actualUploadPort);
+                theComPortIsPauzed = SerialManager.pauzeSerialMonitor(actualUploadPort);
             } catch (Exception e) {
                 Status ret = new Status(IStatus.WARNING, Const.CORE_PLUGIN_ID, Messages.Upload_Error_com_port, e);
                 Common.log(ret);
@@ -93,9 +93,9 @@ protected IStatus run(IProgressMonitor _monitor) {
         boolean ret = super.invokeBuild(kind, project, configuration, builder, console, markerGenerator, projectBuilder,
                 monitor);
 
-        if (WeStoppedTheComPort) {
+        if (theComPortIsPauzed) {
             try {
-                SerialManager.StartSerialMonitor(actualUploadPort);
+                SerialManager.resumeSerialMonitor(actualUploadPort);
             } catch (Exception e) {
                 Status ret2 = new Status(IStatus.WARNING, Const.CORE_PLUGIN_ID,
                         Messages.Upload_Error_serial_monitor_restart, e);

io.sloeber.core/src/io/sloeber/core/tools/uploaders/UploadSketchWrapper.java

@@ -7,6 +7,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.List;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.envvar.EnvironmentVariable;
@@ -43,6 +44,7 @@
 import io.sloeber.core.Messages;
 import io.sloeber.core.api.BoardDescription;
 import io.sloeber.core.api.PasswordManager;
+import io.sloeber.core.api.Serial;
 import io.sloeber.core.api.SerialManager;
 import io.sloeber.core.api.SloeberProject;
 import io.sloeber.core.common.IndexHelper;
@@ -132,7 +134,7 @@ public UploadJobWrapper(String name, SloeberProject project, ICConfigurationDesc
         @Override
         protected IStatus run(IProgressMonitor monitor) {
             IStatus ret = Status.OK_STATUS;
-            boolean WeStoppedTheComPort = false;
+            boolean theComPortIsPauzed = false;
 
             String projectName = myProject.getName();
             BoardDescription boardDescriptor = mySProject.getBoardDescription(myConfDes.getName(), true);
@@ -166,7 +168,7 @@ public void run() {
                 highLevelStream.println(message);
                 monitor.beginTask(message, 2);
                 try {
-                    WeStoppedTheComPort = SerialManager.StopSerialMonitor(myProvidedUploadPort);
+                    theComPortIsPauzed = SerialManager.pauzeSerialMonitor(myProvidedUploadPort);
                 } catch (Exception e) {
                     ret = new Status(IStatus.WARNING, CORE_PLUGIN_ID, Upload_Error_com_port, e);
                     log(ret);
@@ -183,8 +185,22 @@ public void run() {
                 log(new Status(IStatus.ERROR, CORE_PLUGIN_ID, error, e));
             } finally {
                 try {
-                    if (WeStoppedTheComPort) {
-                        SerialManager.StartSerialMonitor(myProvidedUploadPort);
+                    if (theComPortIsPauzed) {
+                        // wait for the port to reappear
+                        boolean portFound = false;
+                        int counter = 0;
+                        while (!portFound & counter++ < 100) {
+                            List<String> currentPorts = Serial.list();
+                            portFound = currentPorts.contains(myProvidedUploadPort);
+                            if (!portFound) {
+                                Thread.sleep(100);
+                            }
+                        }
+                        if (portFound) {
+                            SerialManager.resumeSerialMonitor(myProvidedUploadPort);
+                        } else {
+                            SerialManager.pauzeSerialMonitor(myProvidedUploadPort);
+                        }
                     }
                 } catch (Exception e) {
                     ret = new Status(IStatus.WARNING, CORE_PLUGIN_ID, Messages.Upload_Error_serial_monitor_restart, e);