diff -ur rhino1_7R2pre.orig/examples/Matrix.java rhino1_7R2pre/examples/Matrix.java

--- rhino1_7R2pre.orig/examples/Matrix.java	2008-07-28 10:45:22.000000000 -0400

+++ rhino1_7R2pre/examples/Matrix.java	2008-08-11 00:06:20.483267501 -0400

@@ -249,7 +249,7 @@

      * Use the convenience method from Context that takes care of calling

      * toString, etc.

      */

-    public Object getDefaultValue(Class<?> typeHint) {

+    public Object getDefaultValue(Class typeHint) {

         return "[object Matrix]";

     }

diff -ur rhino1_7R2pre.orig/examples/PrimitiveWrapFactory.java rhino1_7R2pre/examples/PrimitiveWrapFactory.java

--- rhino1_7R2pre.orig/examples/PrimitiveWrapFactory.java	2008-07-28 10:45:22.000000000 -0400

+++ rhino1_7R2pre/examples/PrimitiveWrapFactory.java	2008-08-11 00:07:30.546266985 -0400

@@ -57,7 +57,7 @@

 public class PrimitiveWrapFactory extends WrapFactory {

   @Override

   public Object wrap(Context cx, Scriptable scope, Object obj,

-                     Class<?> staticType)

+                     Class staticType)

   {

     if (obj instanceof String || obj instanceof Number ||

         obj instanceof Boolean)

diff -ur rhino1_7R2pre.orig/src/org/mozilla/javascript/WrapFactory.java rhino1_7R2pre/src/org/mozilla/javascript/WrapFactory.java

--- rhino1_7R2pre.orig/src/org/mozilla/javascript/WrapFactory.java	2008-07-28 10:45:14.000000000 -0400

+++ rhino1_7R2pre/src/org/mozilla/javascript/WrapFactory.java	2008-08-11 00:07:57.706710143 -0400

@@ -75,7 +75,7 @@

      * @return the wrapped value.

      */

     public Object wrap(Context cx, Scriptable scope,

-                       Object obj, Class<?> staticType)

+                       Object obj, Class staticType)

     {

         if (obj == null || obj == Undefined.instance

             || obj instanceof Scriptable)

diff -ur rhino1_7R2pre.orig/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java rhino1_7R2pre/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java

--- rhino1_7R2pre.orig/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	2008-07-28 10:45:18.000000000 -0400

+++ rhino1_7R2pre/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java	2008-08-11 00:06:20.483267501 -0400

@@ -67,7 +67,7 @@

             return super.defineClass(name, data, 0, data.length, domain);

         }

-        public void linkClass(Class<?> cl) {

+        public void linkClass(Class cl) {

             resolveClass(cl);

         }

     }

diff -ur rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java

--- rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java	2008-07-28 10:45:20.000000000 -0400

+++ rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java	2008-08-11 00:06:20.483267501 -0400

@@ -115,7 +115,7 @@

     }

     @Override

-    public Object getDefaultValue(Class<?> hint) {

+    public Object getDefaultValue(Class hint) {

         return uri();

     }

diff -ur rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java

--- rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java	2008-07-28 10:45:20.000000000 -0400

+++ rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java	2008-08-11 00:06:20.484267636 -0400

@@ -145,7 +145,7 @@

     }

     @Override

-    public Object getDefaultValue(Class<?> hint) {

+    public Object getDefaultValue(Class hint) {

         return toString();

     }

diff -ur rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java

--- rhino1_7R2pre.orig/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java	2008-07-28 10:45:20.000000000 -0400

+++ rhino1_7R2pre/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java	2008-08-11 00:06:20.498268536 -0400

@@ -165,7 +165,7 @@

     }

     @Override

-    public final Object getDefaultValue(Class<?> hint) {

+    public final Object getDefaultValue(Class hint) {

         return this.toString();

     }

--- rhino1_7R2/toolsrc/org/mozilla/javascript/tools/shell/Main.java.orig	2009-02-11 12:18:47.217732045 -0500

+++ rhino1_7R2/toolsrc/org/mozilla/javascript/tools/shell/Main.java	2009-02-11 12:19:01.014731265 -0500

@@ -43,6 +43,8 @@

 package org.mozilla.javascript.tools.shell;

 import java.io.BufferedReader;

+import java.io.BufferedWriter;

+import java.io.FileWriter;

 import java.io.IOException;

 import java.io.InputStream;

 import java.io.InputStreamReader;

@@ -65,6 +65,7 @@

 import org.mozilla.javascript.Scriptable;

 import org.mozilla.javascript.ScriptableObject;

 import org.mozilla.javascript.SecurityController;

+import org.mozilla.javascript.WrappedException;

 import org.mozilla.javascript.tools.SourceReader;

 import org.mozilla.javascript.tools.ToolErrorReporter;