src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java

rev 48495 : 8189102: All tools should support -?, -h and --help
Reviewed-by: kvn, jjg, weijun, alanb, rfield, ksrini

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 455,466 ****
                  digestalg = args[n];
              } else if (collator.compare(flags, "-certs") ==0) {
                  showcerts = true;
              } else if (collator.compare(flags, "-strict") ==0) {
                  strict = true;
!             } else if (collator.compare(flags, "-h") == 0 ||
!                         collator.compare(flags, "-?") == 0 ||
                          collator.compare(flags, "-help") == 0) {
                  fullusage();
              } else {
                  System.err.println(
                          rb.getString("Illegal.option.") + flags);
--- 455,468 ----
                  digestalg = args[n];
              } else if (collator.compare(flags, "-certs") ==0) {
                  showcerts = true;
              } else if (collator.compare(flags, "-strict") ==0) {
                  strict = true;
!             } else if (collator.compare(flags, "-?") == 0 ||
!                        collator.compare(flags, "-h") == 0 ||
!                        collator.compare(flags, "--help") == 0 ||
!                        // -help: legacy.
                         collator.compare(flags, "-help") == 0) {
                  fullusage();
              } else {
                  System.err.println(
                          rb.getString("Illegal.option.") + flags);
*** 646,655 ****
--- 648,660 ----
                  (".strict.treat.warnings.as.errors"));
          System.out.println();
          System.out.println(rb.getString
                  (".conf.url.specify.a.pre.configured.options.file"));
          System.out.println();
+         System.out.println(rb.getString
+                 (".print.this.help.message"));
+         System.out.println();
  
          System.exit(0);
      }
  
      void verifyJar(String jarName)