Address #394: only complain about exceptions with ending PC/SC sessions in verbose mode

Author: martinpaljak

tool/src/main/java/pro/javacard/gptool/GPTool.java

@@ -183,29 +183,25 @@ public static void main(String[] argv) {
             ret = new GPTool().run(CardBIBO.wrap(c), argv);
         } catch (IllegalArgumentException e) {
             System.err.println("Invalid argument: " + e.getMessage());
-            if (isTrace)
-                e.printStackTrace();
+            trace(e);
         } catch (Exception e) {
             System.err.println("Error: " + e.getMessage());
-            if (isTrace)
-                e.printStackTrace();
+            trace(e);
         } finally {
             if (c != null) {
                 if (transact) {
                     try {
                         c.endExclusive();
                     } catch (CardException e) {
-                        System.err.println("Exception when ending card transaction: " + e.getMessage());
-                        if (isTrace)
-                            e.printStackTrace();
+                        verbose("Exception when ending card transaction: " + e.getMessage());
+                        trace(e);
                     }
                 }
                 try {
                     c.disconnect(resetOnDisconnect);
                 } catch (CardException e) {
-                    System.err.println("Exception when disconnecting card: " + e.getMessage());
-                    if (isTrace)
-                        e.printStackTrace();
+                    verbose("Exception when disconnecting card: " + e.getMessage());
+                    trace(e);
                 }
             }
         }
@@ -910,8 +906,7 @@ else if (keyver >= 0x30 && keyver <= 0x3F)
             return 0;
         } catch (IOException e) {
             System.err.println("ERROR: " + e.getMessage());
-            if (isTrace)
-                e.printStackTrace();
+            trace(e);
         } catch (ReceiptVerifier.ReceiptVerificationException e) {
             /// XXX: refactor
             System.err.println("WARNING: Operation completed, but receipt verification failed");
@@ -1185,9 +1180,15 @@ private static boolean needsAuthentication(OptionSet args) {
         return Arrays.stream(yes).anyMatch(args::has);
     }
 
-    private void verbose(String s) {
+    private static void verbose(String s) {
         if (isVerbose) {
             System.out.println("# " + s);
         }
     }
+
+    private static void trace(Exception e) {
+        if (isTrace) {
+            e.printStackTrace();
+        }
+    }
 }