src/jdk.incubator.jpackage/share/classes/jdk/incubator/jpackage/internal/Log.java

@@ -21,11 +21,11 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-package jdk.jpackage.internal;
+package jdk.incubator.jpackage.internal;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;

@@ -39,16 +39,20 @@
     public static class Logger {
         private boolean verbose = false;
         private PrintWriter out = null;
         private PrintWriter err = null;
 
-        public Logger(boolean v) {
-            verbose = v;
+        // verbose defaults to true unless environment variable JPACKAGE_DEBUG
+        // is set to true.
+        // Then it is only set to true by using --verbose jpackage option
+
+        public Logger() {
+            verbose = ("true".equals(System.getenv("JPACKAGE_DEBUG")));
         }
 
-        public void setVerbose(boolean v) {
-            verbose = v;
+        public void setVerbose() {
+            verbose = true;
         }
 
         public boolean isVerbose() {
             return verbose;
         }

@@ -83,47 +87,30 @@
                 System.err.println(msg);
             }
         }
 
         public void verbose(Throwable t) {
-            if (out != null && (Log.debug || verbose)) {
+            if (out != null && verbose) {
                 t.printStackTrace(out);
-            } else if (Log.debug || verbose) {
+            } else if (verbose) {
                 t.printStackTrace(System.out);
             }
         }
 
         public void verbose(String msg) {
-            if (out != null && (Log.debug || verbose)) {
-                out.println(msg);
-            } else if (Log.debug || verbose) {
-                System.out.println(msg);
-            }
-        }
-
-        public void debug(String msg) {
-            if (out != null && Log.debug) {
+            if (out != null && verbose) {
                 out.println(msg);
-            } else if (Log.debug) {
+            } else if (verbose) {
                 System.out.println(msg);
             }
         }
     }
 
     private static Logger delegate = null;
-    private static boolean debug =
-            "true".equals(System.getenv("JPACKAGE_DEBUG"));
 
-    public static void setLogger(Logger l) {
-        delegate = l;
-        if (l == null) {
-            delegate = new Logger(false);
-        }
-    }
-
-    public static Logger getLogger() {
-        return delegate;
+    public static void setLogger(Logger logger) {
+        delegate = (logger != null) ? logger : new Logger();
     }
 
     public static void flush() {
         if (delegate != null) {
             delegate.flush();

@@ -140,22 +127,18 @@
         if (delegate != null) {
             delegate.error(msg);
         }
     }
 
-    public static void setVerbose(boolean v) {
+    public static void setVerbose() {
         if (delegate != null) {
-            delegate.setVerbose(v);
+            delegate.setVerbose();
         }
     }
 
     public static boolean isVerbose() {
-        if (delegate != null) {
-            return delegate.isVerbose();
-        }
-
-        return false; // Off by default
+        return (delegate != null) ? delegate.isVerbose() : false;
     }
 
     public static void verbose(String msg) {
         if (delegate != null) {
            delegate.verbose(msg);

@@ -165,31 +148,6 @@
     public static void verbose(Throwable t) {
         if (delegate != null) {
            delegate.verbose(t);
         }
     }
-
-    public static void debug(String msg) {
-        if (delegate != null) {
-           delegate.debug(msg);
-        }
-    }
-
-    public static void debug(Throwable t) {
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-            try (PrintStream ps = new PrintStream(baos)) {
-                t.printStackTrace(ps);
-            }
-            debug(baos.toString());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static boolean isDebug() {
-        return debug;
-    }
-
-    public static void setDebug(boolean debug) {
-        Log.debug = debug;
-    }
 }