/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset 8d87108be099 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8d87108be099
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Sep 18 15:46:55 2013 +0200

	Fixed minor typo in JEditorPaneBasedExceptionDialogTest (mus -> must) severla times
	"message from dialog mus be same as pattern" -> "message from dialog must be same as pattern"


changeset 6344db94b95f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6344db94b95f
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Sep 18 15:54:12 2013 +0200

	Removed java 1.3 comaptible (redundant) code from  ParseException
	netx/net/sourceforge/jnlp/ParseException.java: (ParseException) modified to support super call only, (getCause) and both (printStackTrace) removed


diffstat:

 ChangeLog                                                                                        |   7 +
 netx/net/sourceforge/jnlp/ParseException.java                                                    |  45 +---------
 tests/netx/unit/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialogTest.java |   8 +-
 3 files changed, 14 insertions(+), 46 deletions(-)

diffs (93 lines):

diff -r 075e3da46eda -r 6344db94b95f ChangeLog
--- a/ChangeLog	Mon Sep 16 16:18:52 2013 -0400
+++ b/ChangeLog	Wed Sep 18 15:54:12 2013 +0200
@@ -1,3 +1,10 @@
+2013-09-18  Jiri Vanek  <jvanek at redhat.com>
+
+	Removed java 1.3 comaptible (redundant) code from  ParseException
+	* netx/net/sourceforge/jnlp/ParseException.java: (ParseException)
+	modified to support super call only, (getCause) and both (printStackTrace)
+	removed
+
 2013-09-16  Andrew Azores  <aazores at redhat.com>
 
 	Fix ResourcesTest reproducer.
diff -r 075e3da46eda -r 6344db94b95f netx/net/sourceforge/jnlp/ParseException.java
--- a/netx/net/sourceforge/jnlp/ParseException.java	Mon Sep 16 16:18:52 2013 -0400
+++ b/netx/net/sourceforge/jnlp/ParseException.java	Wed Sep 18 15:54:12 2013 +0200
@@ -30,9 +30,7 @@
     // todo: add meaningful information, such as the invalid
     // element, parse position, etc.
 
-    /** the original exception */
-    private Throwable cause = null;
-
+   
     /**
      * Create a parse exception with the specified message.
      */
@@ -45,44 +43,7 @@
      * cause.
      */
     public ParseException(String message, Throwable cause) {
-        super(message);
-
-        // replace with setCause when no longer 1.3 compatible
-        this.cause = cause;
-    }
-
-    /**
-     * Return the cause of the launch exception or null if there
-     * is no cause exception.
-     */
-    public Throwable getCause() {
-        return cause;
-    }
-
-    /**
-     * Print the stack trace and the cause exception (1.3
-     * compatible)
-     */
-    public void printStackTrace(PrintStream stream) {
-        super.printStackTrace(stream);
-
-        if (cause != null) {
-            stream.println("Caused by: ");
-            cause.printStackTrace(stream);
-        }
-    }
-
-    /**
-     * Print the stack trace and the cause exception (1.3
-     * compatible)
-     */
-    public void printStackTrace(PrintWriter stream) {
-        super.printStackTrace(stream);
-
-        if (cause != null) {
-            stream.println("Caused by: ");
-            cause.printStackTrace(stream);
-        }
-    }
+        super(message, cause);
+    }  
 
 }
diff -r 075e3da46eda -r 6344db94b95f tests/netx/unit/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialogTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialogTest.java	Mon Sep 16 16:18:52 2013 -0400
+++ b/tests/netx/unit/net/sourceforge/jnlp/splashscreen/parts/JEditorPaneBasedExceptionDialogTest.java	Wed Sep 18 15:54:12 2013 +0200
@@ -132,10 +132,10 @@
         JEditorPaneBasedExceptionDialog d2 = new JEditorPaneBasedExceptionDialog(null, false, ex, ec, null);
         JEditorPaneBasedExceptionDialog d3 = new JEditorPaneBasedExceptionDialog(null, false, ex, null, ai);
         JEditorPaneBasedExceptionDialog d4 = new JEditorPaneBasedExceptionDialog(null, false, null, ec, ai);
-        Assert.assertTrue("message from dialog mus be same as pattern", d1.getMessage().equals(s1));
-        Assert.assertTrue("message from dialog mus be same as pattern", d2.getMessage().equals(s2));
-        Assert.assertTrue("message from dialog mus be same as pattern", d3.getMessage().equals(s3));
-        Assert.assertTrue("message from dialog mus be same as pattern", d4.getMessage().equals(s4));
+        Assert.assertTrue("message from dialog must be same as pattern", d1.getMessage().equals(s1));
+        Assert.assertTrue("message from dialog must be same as pattern", d2.getMessage().equals(s2));
+        Assert.assertTrue("message from dialog must be same as pattern", d3.getMessage().equals(s3));
+        Assert.assertTrue("message from dialog must be same as pattern", d4.getMessage().equals(s4));
 
     }