From bf89d620ace4a20270fee72285f9c4c9bfa6b345 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Wed, 14 Mar 2012 11:27:16 -0400
Subject: Launch errors are not being printed to terminal

2012-03-14  Omair Majid  <omajid@redhat.com>

    Print exceptions to terminal when running in gui mode too.
    * netx/net/sourceforge/jnlp/AbstractLaunchHandler.java: New file.
    * netx/net/sourceforge/jnlp/DefaultLaunchHandler.java: Extend
    AbstractLaunchHandler.
    (DefaultLaunchHandler): New method.
    (printMessage): Moved to parent class.
    * netx/net/sourceforge/jnlp/GuiLaunchHandler.java: Extend
    AbstractLaunchHandler.
    (GuiLauchHandler): New method.
    (launchError): Print the error too.
    (launchWarning,validationError): Call parent's printMessage.
    * netx/net/sourceforge/jnlp/LaunchException.java: Use standard java
    exception chaining. This removes compatibility with pre-java 1.3 class
    libraries.
    (LaunchException(JNLPFile,Exception,String,String,String,String)): Pass
    cause to parent so exceptions are chanined properly.
    (LaunchException(String,Throwable),LaunchException(Throwable)): Call
    parent's constructor.
    (printStackTrace(PrintStream),printStackTrace(PrintWriter),getCause):
    Removed. Use parent's implementation instead.
    (getCauses): Removed.
    * netx/net/sourceforge/jnlp/LaunchHandler.java
    (validationError): Rename argument to clarify meaing.
    * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
    (initialize): Redirect output of all handlers to System.err.
    * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
    (PluginAppletSecurityContext): Likewise.
    * tests/netx/unit/net/sourceforge/jnlp/DefaultLaunchHandlerTest.java,
    * tests/netx/unit/net/sourceforge/jnlp/LaunchExceptionTest.java: New
    file. Contains tests.
---
 .../sourceforge/jnlp/AbstractLaunchHandler.java    | 84 ++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 netx/net/sourceforge/jnlp/AbstractLaunchHandler.java

(limited to 'netx/net/sourceforge/jnlp/AbstractLaunchHandler.java')

diff --git a/netx/net/sourceforge/jnlp/AbstractLaunchHandler.java b/netx/net/sourceforge/jnlp/AbstractLaunchHandler.java
new file mode 100644
index 0000000..c9d5d70
--- /dev/null
+++ b/netx/net/sourceforge/jnlp/AbstractLaunchHandler.java
@@ -0,0 +1,84 @@
+/* AbstractLaunchHandler.java
+   Copyright (C) 2012 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package net.sourceforge.jnlp;
+
+import java.io.PrintStream;
+
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
+
+public abstract class AbstractLaunchHandler implements LaunchHandler {
+
+    protected final PrintStream outputStream;
+
+    public AbstractLaunchHandler(PrintStream outputStream) {
+        this.outputStream = outputStream;
+    }
+
+    /**
+     * Print a message
+     */
+    protected void printMessage(LaunchException ex) {
+        StringBuilder result = new StringBuilder();
+        result.append("netx: ");
+        result.append(ex.getCategory());
+        if (ex.getSummary() != null) {
+            result.append(": ");
+            result.append(ex.getSummary());
+        }
+        if (ex.getCause() != null) {
+            result.append(recursiveDescription(ex.getCause()));
+        }
+        outputStream.println(result);
+
+        if (JNLPRuntime.isDebug()) {
+            ex.printStackTrace(outputStream);
+        }
+    }
+
+    private String recursiveDescription(Throwable throwable) {
+        StringBuilder builder = new StringBuilder();
+        builder.append(" (");
+        builder.append(throwable.getMessage() == null ? "" : throwable.getMessage());
+        if (throwable.getCause() != null) {
+            builder.append(recursiveDescription(throwable.getCause()));
+        }
+        builder.append(")");
+        return builder.toString();
+    }
+
+}
-- 
cgit v1.2.3