Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-22 01:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into ui-integration

Browse Source 
# Conflicts:
#	Main/src/main/java/com/chameleonvision/network/NetworkManager.java
#	Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java
#	Main/src/main/java/com/chameleonvision/vision/process/PipelineResult.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
#	Main/src/main/java/com/chameleonvision/web/ServerHandler.java
This commit is contained in:
ori agranat
2019-10-24 02:12:04 +03:00
parent 2f7075e6ff 1871f02a5a
commit e1f908e0a1
12 changed files with 22 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Main/src/main/java/com/chameleonvision/util/ShellExec.java
View File

@@ -101,7 +101,7 @@ public class ShellExec {
* http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html?page=4
*/
@SuppressWarnings("WeakerAccess")
private class StreamGobbler extends Thread {
private static class StreamGobbler extends Thread {
private InputStream is;
private StringBuilder output;
private volatile boolean completed; // mark volatile to guarantee a thread safety

2
Main/src/main/java/com/chameleonvision/util/Utilities.java
View File

@@ -26,7 +26,7 @@ public class Utilities {
}
public static List<Integer> getDigits(int num) {
List<Integer> digits = new ArrayList<Integer>();
List<Integer> digits = new ArrayList<>();
collectDigits(num, digits);
return digits;
}