LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AI 147180: am: CL 147176 am: CL 147174 ADT #1801919: Make default options output a bit more friendly.

Browse Source 
Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147180
This commit is contained in:
Raphael Moll
2009-04-21 13:06:35 -07:00
committed by The Android Open Source Project
parent 1874be3ce7
commit 4df53adc8d
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tools/sdkmanager/app/src/com/android/sdkmanager/CommandLineProcessor.java
View File

@@ -482,21 +482,28 @@ public class CommandLineProcessor {
if (arg.getVerb().equals(verb) && arg.getDirectObject().equals(directObject)) {
String value = "";
if (arg.getDefaultValue() instanceof String[]) {
for (String v : (String[]) arg.getDefaultValue()) {
if (value.length() > 0) {
value += ", ";
}
value += v;
}
} else if (arg.getDefaultValue() != null) {
value = arg.getDefaultValue().toString();
}
if (value.length() > 0) {
value = " (" + value + ")";
}
String required = "";
if (arg.isMandatory()) {
required = " [required]";
String required = arg.isMandatory() ? " [required]" : "";
} else {
if (arg.getDefaultValue() instanceof String[]) {
for (String v : (String[]) arg.getDefaultValue()) {
if (value.length() > 0) {
value += ", ";
}
value += v;
}
} else if (arg.getDefaultValue() != null) {
Object v = arg.getDefaultValue();
if (arg.getMode() != MODE.BOOLEAN || v.equals(Boolean.TRUE)) {
value = v.toString();
}
}
if (value.length() > 0) {
value = " [Default: " + value + "]";
}
}
stdout(" -%1$s %2$-10s %3$s%4$s%5$s",
arg.getShortArg(),