change method to extract iSerial field from Windows

facchinm · facchinm · commit 153aa389c389 · 2015-11-24T16:33:26.000+01:00
diff --git a/arduino-core/src/processing/app/windows/ListComPortsParser.java b/arduino-core/src/processing/app/windows/ListComPortsParser.java
@@ -59,7 +59,7 @@ public String extractVIDAndPID(String output, String serial) throws IOException
         String vidPidPart = lineParts[lineParts.length - 1];
         Matcher vidMatcher = vidRegExp.matcher(vidPidPart);
         Matcher pidMatcher = pidRegExp.matcher(vidPidPart);
-        String iSerial = vidPidPart.substring(vidPidPart.indexOf("PID_")+8);
+        String iSerial = vidPidPart.substring(vidPidPart.lastIndexOf("\\")+1);
         if (vidMatcher.find() && pidMatcher.find()) {
           return ("0x" + vidMatcher.group(1) + "_0x" + pidMatcher.group(1)).toUpperCase() + "_" + iSerial;
         }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public String extractVIDAndPID(String output, String serial) throws IOException`
`59`	`59`	`String vidPidPart = lineParts[lineParts.length - 1];`
`60`	`60`	`Matcher vidMatcher = vidRegExp.matcher(vidPidPart);`
`61`	`61`	`Matcher pidMatcher = pidRegExp.matcher(vidPidPart);`
`62`		`- String iSerial = vidPidPart.substring(vidPidPart.indexOf("PID_")+8);`
	`62`	`+ String iSerial = vidPidPart.substring(vidPidPart.lastIndexOf("\\")+1);`
`63`	`63`	`if (vidMatcher.find() && pidMatcher.find()) {`
`64`	`64`	`return ("0x" + vidMatcher.group(1) + "_0x" + pidMatcher.group(1)).toUpperCase() + "_" + iSerial;`
`65`	`65`	`}`