From d0939886566be7f0d8a14536f618a4485f1cc3b6 Mon Sep 17 00:00:00 2001
From: hoenicke <hoenicke@379699f6-c40d-0410-875b-85095c16579e>
Date: Wed, 11 Apr 2001 16:56:04 +0000
Subject: [PATCH] Reworked usage message.

git-svn-id: https://svn.code.sf.net/p/jode/code/branches/branch_1_1@1312 379699f6-c40d-0410-875b-85095c16579e
---
 jode/ChangeLog                 |  4 ++++
 jode/jode/decompiler/Main.java | 23 ++++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/jode/ChangeLog b/jode/ChangeLog
index 25f421f..08664b9 100644
--- a/jode/ChangeLog
+++ b/jode/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-10  Jochen Hoenicke  <jochen@gnu.org>
+
+	* jode/decompiler/Main.java (usage):  Reworked usage message.
+
 2001-04-09  Jochen Hoenicke  <jochen@gnu.org>
 
 	* jode/bytecode/SearchPath.java: Bug fixes from Joe Bronkema:
diff --git a/jode/jode/decompiler/Main.java b/jode/jode/decompiler/Main.java
index cad2858..f46496b 100644
--- a/jode/jode/decompiler/Main.java
+++ b/jode/jode/decompiler/Main.java
@@ -75,7 +75,10 @@ public class Main extends Options {
     public static void usage() {
 	PrintWriter err = GlobalOptions.err;
 	err.println("Version: " + GlobalOptions.version);
-        err.println("Usage: java jode.decompiler.Main [OPTIONS]... [CLASSES]...");
+        err.println("Usage: java jode.decompiler.Main [OPTION]* {CLASS|JAR}*");
+	err.println("Give a fully qualified CLASS name, e.g. jode.decompiler.Main, if you want to");
+	err.println("decompile a single class, or a JAR file containing many classes.");
+	err.println("OPTION is any of these:");
 	err.println("  -h, --help           "+
 		    "show this information.");
 	err.println("  -V, --version        "+
@@ -96,9 +99,13 @@ public class Main extends Options {
 	err.println("                       "+
 		    "and packages with more then pkglimit used classes.");
 	err.println("                       "+
-		    "Limit 0 means, never import, default is 0,1.");
+		    "Limit 0 means never import. Default is 0,1.");
+	err.println("  -D, --debug=...      "+
+		    "use --debug=help for more information.");
 
 	err.println("The following options can be turned on or off with `yes' or `no' argument.");
+	err.println("The options tagged with (default) are normally on.  Omitting the yes/no");
+	err.println("argument will toggle the option, e.g. --verify is equivalent to --verify=no.");
 	err.println("      --inner          "+
 		    "decompile inner classes (default).");
 	err.println("      --anonymous      "+
@@ -108,7 +115,7 @@ public class Main extends Options {
 	err.println("      --lvt            "+
 		    "use the local variable table (default).");
 	err.println("      --pretty         "+
-		    "use `pretty' names for local variables.");
+		    "use `pretty' names for local variables (default).");
 	err.println("      --push           "+
 		    "allow PUSH instructions in output.");
 	err.println("      --decrypt        "+
@@ -118,10 +125,7 @@ public class Main extends Options {
 	err.println("      --immediate      "+
 		    "output source immediately (may produce buggy code).");
 	err.println("      --verify         "+
-		    "verify code before decompiling it.");
-	err.println("Debugging options, mainly used to debug this decompiler:");
-	err.println("  -D, --debug=...      "+
-		    "use --debug=help for more information.");
+		    "verify code before decompiling it (default).");
     }
 
     public static boolean handleOption(int option, int longind, String arg) {
@@ -133,8 +137,9 @@ public class Main extends Options {
 	    options &= ~(1 << option);
 	else {
 	    GlobalOptions.err.println
-		("jode.decompiler.Main: option --"+longOptions[longind].getName()
-		 +" takes one of `yes', `no', `on', `off' as parameter");
+		("jode.decompiler.Main: option --"
+		 + longOptions[longind].getName()
+		 + " takes one of `yes', `no', `on', `off' as parameter");
 	    return false;
 	}
 	return true;