noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use an "action" enum when processing commandline arguments 

Previously, two separate booleans (doUpload and doVerify) were used.
However, since it always makes sense to specify only one of them, it
makes more sense to keep a single action enum variable, which slightly
simplifies the code (especially when more actions are added later).

Additionally, an error is now shown when both --verify and --upload are
specified on the commandline.
This commit is contained in:
Matthijs Kooijman 2014-04-07 09:51:25 +02:00 committed by Cristian Maglie
parent 11cfe2b81e
commit 6a09ee5eb6
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,6 +268,7 @@ public class Base {
}
protected static enum ACTION { GUI, VERIFY, UPLOAD };
public Base(String[] args) throws Exception {
platform.init(this);
@ -318,8 +319,7 @@ public class Base {
// Setup board-dependent variables.
onBoardOrPortChange();
boolean doUpload = false;
boolean doVerify = false;
ACTION action = ACTION.GUI;
boolean doVerboseBuild = false;
boolean doVerboseUpload = false;;
String selectBoard = null;
@ -327,14 +327,21 @@ public class Base {
String currentDirectory = System.getProperty("user.dir");
List<String> filenames = new LinkedList<String>();
// Map of possible actions and corresponding options
final Map<String, ACTION> actions = new HashMap<String, ACTION>();
actions.put("--verify", ACTION.VERIFY);
actions.put("--upload", ACTION.UPLOAD);
// Check if any files were passed in on the command line
for (int i = 0; i < args.length; i++) {
if (args[i].equals("--upload")) {
doUpload = true;
continue;
}
if (args[i].equals("--verify")) {
doVerify = true;
ACTION a = actions.get(args[i]);
if (a != null) {
if (action != ACTION.GUI) {
String[] valid = actions.keySet().toArray(new String[0]);
String mess = I18n.format(_("Can only pass one of: {0}"), PApplet.join(valid, ", "));
showError(null, mess, 3);
}
action = a;
continue;
}
if (args[i].equals("--verbose") || args[i].equals("-v")) {
@ -391,7 +398,7 @@ public class Base {
filenames.add(args[i]);
}
if ((doUpload || doVerify) && filenames.size() != 1)
if ((action == ACTION.UPLOAD || action == ACTION.VERIFY) && filenames.size() != 1)
showError(null, _("Must specify exactly one sketch file"), 3);
for (String path: filenames) {
@ -412,17 +419,17 @@ public class Base {
path = new File(currentDirectory, path).getAbsolutePath();
}
if (handleOpen(path, nextEditorLocation(), !(doUpload || doVerify)) == null) {
if (handleOpen(path, nextEditorLocation(), !(action == ACTION.UPLOAD || action == ACTION.VERIFY)) == null) {
String mess = I18n.format(_("Failed to open sketch: \"{0}\""), path);
// Open failure is fatal in upload/verify mode
if (doUpload || doVerify)
if (action == ACTION.VERIFY || action == ACTION.UPLOAD)
showError(null, mess, 2);
else
showWarning(null, mess, null);
}
}
if (doUpload || doVerify) {
if (action == ACTION.UPLOAD || action == ACTION.VERIFY) {
// Set verbosity for command line build
Preferences.set("build.verbose", "" + doVerboseBuild);
Preferences.set("upload.verbose", "" + doVerboseUpload);
@ -432,7 +439,7 @@ public class Base {
// Do board selection if requested
processBoardArgument(selectBoard);
if (doUpload) {
if (action == ACTION.UPLOAD) {
// Build and upload
if (selectPort != null)
editor.selectSerialPort(selectPort);