1
0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00

Code cleanup

This commit is contained in:
Federico Fissore 2015-06-25 10:40:26 +02:00
parent ea92393569
commit 62e5e0186f

View File

@ -41,12 +41,12 @@ public class CommandlineParser {
private String getPref; private String getPref;
private String boardToInstall; private String boardToInstall;
private String libraryToInstall; private String libraryToInstall;
private List<String> filenames = new LinkedList<String>(); private final List<String> filenames = new LinkedList<>();
public CommandlineParser(String[] args) { public CommandlineParser(String[] args) {
this.args = args; this.args = args;
actions = new HashMap<String, ACTION>(); actions = new HashMap<>();
actions.put("--verify", ACTION.VERIFY); actions.put("--verify", ACTION.VERIFY);
actions.put("--upload", ACTION.UPLOAD); actions.put("--upload", ACTION.UPLOAD);
actions.put("--get-pref", ACTION.GET_PREF); actions.put("--get-pref", ACTION.GET_PREF);
@ -236,16 +236,19 @@ public class CommandlineParser {
TargetPackage targetPackage = BaseNoGui.getTargetPackage(split[0]); TargetPackage targetPackage = BaseNoGui.getTargetPackage(split[0]);
if (targetPackage == null) { if (targetPackage == null) {
BaseNoGui.showError(null, I18n.format(_("{0}: Unknown package"), split[0]), 3); BaseNoGui.showError(null, I18n.format(_("{0}: Unknown package"), split[0]), 3);
return;
} }
TargetPlatform targetPlatform = targetPackage.get(split[1]); TargetPlatform targetPlatform = targetPackage.get(split[1]);
if (targetPlatform == null) { if (targetPlatform == null) {
BaseNoGui.showError(null, I18n.format(_("{0}: Unknown architecture"), split[1]), 3); BaseNoGui.showError(null, I18n.format(_("{0}: Unknown architecture"), split[1]), 3);
return;
} }
TargetBoard targetBoard = targetPlatform.getBoard(split[2]); TargetBoard targetBoard = targetPlatform.getBoard(split[2]);
if (targetBoard == null || !targetBoard.getId().equals(split[2])) { if (targetBoard == null || !targetBoard.getId().equals(split[2])) {
BaseNoGui.showError(null, I18n.format(_("{0}: Unknown board"), split[2]), 3); BaseNoGui.showError(null, I18n.format(_("{0}: Unknown board"), split[2]), 3);
return;
} }
BaseNoGui.selectBoard(targetBoard); BaseNoGui.selectBoard(targetBoard);
@ -314,7 +317,7 @@ public class CommandlineParser {
return action == ACTION.UPLOAD; return action == ACTION.UPLOAD;
} }
public boolean isVerifyMode() { private boolean isVerifyMode() {
return action == ACTION.VERIFY; return action == ACTION.VERIFY;
} }