rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-21 10:52:14 +01:00
Code Issues Releases Activity

Removed some trivial warnings

Browse Source
This commit is contained in:
Cristian Maglie 2020-03-25 12:59:36 +01:00 committed by Cristian Maglie
parent 931c2b7f21
commit a1e43ce490
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/processing/app/Base.java
View File

@ -999,9 +999,9 @@ public class Base {
// kill uploader (if still alive)
UploaderUtils uploaderInstance = new UploaderUtils();
Uploader uploader = uploaderInstance.getUploaderByPreferences(false);
if (uploader != null && uploader.programmerPid != null && uploader.programmerPid.isAlive()) {
if (uploader != null && Uploader.programmerPid != null && Uploader.programmerPid.isAlive()) {
// kill the stuck programmer
uploader.programmerPid.destroyForcibly();
Uploader.programmerPid.destroyForcibly();
}
if (handleQuitEach()) {
@ -1444,8 +1444,9 @@ public class Base {
String filterText = "";
String dropdownItem = "";
if (actionevent instanceof Event) {
filterText = ((Event) actionevent).getPayload().get("filterText").toString();
dropdownItem = ((Event) actionevent).getPayload().get("dropdownItem").toString();
Event e = ((Event) actionevent);
filterText = e.getPayload().get("filterText").toString();
dropdownItem = e.getPayload().get("dropdownItem").toString();
}
try {
openBoardsManager(filterText, dropdownItem);
@ -1481,7 +1482,7 @@ public class Base {
ButtonGroup boardsButtonGroup = new ButtonGroup();
Map<String, ButtonGroup> buttonGroupsMap = new HashMap<>();
List<JMenu> platformMenus = new ArrayList<JMenu>();
List<JMenu> platformMenus = new ArrayList<>();
// Cycle through all packages
for (TargetPackage targetPackage : BaseNoGui.packages.values()) {
@ -1602,7 +1603,7 @@ public class Base {
};
List<TargetBoard> boards = (List<TargetBoard>) subAction.getValue("board");
if (boards == null) {
boards = new ArrayList<TargetBoard>();
boards = new ArrayList<>();
}
boards.add(board);
subAction.putValue("board", boards);
@ -2003,6 +2004,7 @@ public class Base {
Base.this.handleFontSizeChange(-1);
}
break;
default:
}
}
}