Reflow dx help text
Rewrap the dx help text so that it all fits on 80 character display,
while also removing extra line wrapping at 80 characters in the code
that was making the code less readable.
Test: dx --help
Change-Id: I9c7fbd76744a0ee51c6b07a272b3a9aa9f7c72f2
diff --git a/dx/src/com/android/dx/command/Main.java b/dx/src/com/android/dx/command/Main.java
index 44df20e..17038cd 100644
--- a/dx/src/com/android/dx/command/Main.java
+++ b/dx/src/com/android/dx/command/Main.java
@@ -25,56 +25,42 @@
public class Main {
private static final String USAGE_MESSAGE =
"usage:\n" +
- " dx --dex [--debug] [--verbose] [--positions=<style>] " +
- "[--no-locals]\n" +
- " [--no-optimize] [--statistics] [--[no-]optimize-list=<file>] " +
- "[--no-strict]\n" +
- " [--keep-classes] [--output=<file>] [--dump-to=<file>] " +
- "[--dump-width=<n>]\n" +
- " [--dump-method=<name>[*]] [--verbose-dump] [--no-files] " +
- "[--core-library]\n" +
+ " dx --dex [--debug] [--verbose] [--positions=<style>] [--no-locals]\n" +
+ " [--no-optimize] [--statistics] [--[no-]optimize-list=<file>] [--no-strict]\n" +
+ " [--keep-classes] [--output=<file>] [--dump-to=<file>] [--dump-width=<n>]\n" +
+ " [--dump-method=<name>[*]] [--verbose-dump] [--no-files] [--core-library]\n" +
" [--num-threads=<n>] [--incremental] [--force-jumbo] [--no-warning]\n" +
" [--multi-dex [--main-dex-list=<file> [--minimal-main-dex]]\n" +
" [--input-list=<file>]\n" +
" [<file>.class | <file>.{zip,jar,apk} | <directory>] ...\n" +
- " Convert a set of classfiles into a dex file, optionally " +
- "embedded in a\n" +
- " jar/zip. Output name must end with one of: .dex .jar " +
- ".zip .apk or be a directory.\n" +
+ " Convert a set of classfiles into a dex file, optionally embedded in a\n" +
+ " jar/zip. Output name must end with one of: .dex .jar .zip .apk or be a\n" +
+ " directory.\n" +
" Positions options: none, important, lines.\n" +
- " --multi-dex: allows to generate several dex files if needed. " +
- "This option is \n" +
- " exclusive with --incremental, causes --num-threads to be ignored " +
- "and only\n" +
+ " --multi-dex: allows to generate several dex files if needed. This option is\n" +
+ " exclusive with --incremental, causes --num-threads to be ignored and only\n" +
" supports folder or archive output.\n" +
- " --main-dex-list=<file>: <file> is a list of class file names, " +
- "classes defined by\n" +
- " those class files are put in classes.dex.\n" +
- " --minimal-main-dex: only classes selected by --main-dex-list are " +
- "to be put in\n" +
- " the main dex.\n" +
+ " --main-dex-list=<file>: <file> is a list of class file names, classes\n" +
+ " defined by those class files are put in classes.dex.\n" +
+ " --minimal-main-dex: only classes selected by --main-dex-list are to be put\n" +
+ " in the main dex.\n" +
" --input-list: <file> is a list of inputs.\n" +
- " Each line in <file> must end with one of: .class .jar .zip .apk or be a directory.\n" +
+ " Each line in <file> must end with one of: .class .jar .zip .apk or be a\n" +
+ " directory.\n" +
" dx --annotool --annotation=<class> [--element=<element types>]\n" +
" [--print=<print types>]\n" +
" dx --dump [--debug] [--strict] [--bytes] [--optimize]\n" +
- " [--basic-blocks | --rop-blocks | --ssa-blocks | --dot] " +
- "[--ssa-step=<step>]\n" +
+ " [--basic-blocks | --rop-blocks | --ssa-blocks | --dot] [--ssa-step=<step>]\n" +
" [--width=<n>] [<file>.class | <file>.txt] ...\n" +
- " Dump classfiles, or transformations thereof, in a " +
- "human-oriented format.\n" +
+ " Dump classfiles, or transformations thereof, in a human-oriented format.\n" +
" dx --find-usages <file.dex> <declaring type> <member>\n" +
" Find references and declarations to a field or method.\n" +
- " declaring type: a class name in internal form, like " +
- "Ljava/lang/Object;\n" +
- " member: a field or method name, like hashCode\n" +
- " dx -J<option> ... <arguments, in one of the above " +
- "forms>\n" +
- " Pass VM-specific options to the virtual machine that " +
- "runs dx.\n" +
+ " <declaring type> is a class name in internal form, like Ljava/lang/Object;\n" +
+ " <member> is a field or method name, like hashCode.\n" +
+ " dx -J<option> ... <arguments, in one of the above forms>\n" +
+ " Pass VM-specific options to the virtual machine that runs dx.\n" +
" dx --version\n" +
- " Print the version of this tool (" + Version.VERSION +
- ").\n" +
+ " Print the version of this tool (" + Version.VERSION + ").\n" +
" dx --help\n" +
" Print this message.";
