diff -up rhino1_7R3/examples/Matrix.java.build rhino1_7R3/examples/Matrix.java
--- rhino1_7R3/examples/Matrix.java.build 2011-05-09 20:04:38.000000000 +0200
+++ rhino1_7R3/examples/Matrix.java 2011-09-14 17:37:15.167031995 +0200
@@ -249,7 +249,7 @@ public class Matrix implements Scriptabl
* 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 -up rhino1_7R3/examples/PrimitiveWrapFactory.java.build rhino1_7R3/examples/PrimitiveWrapFactory.java
--- rhino1_7R3/examples/PrimitiveWrapFactory.java.build 2011-05-09 20:04:38.000000000 +0200
+++ rhino1_7R3/examples/PrimitiveWrapFactory.java 2011-09-14 17:37:15.168031994 +0200
@@ -57,7 +57,7 @@ import org.mozilla.javascript.*;
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 -up rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java.build rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java
--- rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java.build 2011-05-09 20:04:34.000000000 +0200
+++ rhino1_7R3/src/org/mozilla/javascript/WrapFactory.java 2011-09-14 17:37:15.169031993 +0200
@@ -75,7 +75,7 @@ public class WrapFactory
* @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 -up rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml.build rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml
--- rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml.build 2011-05-09 20:04:36.000000000 +0200
+++ rhino1_7R3/toolsrc/org/mozilla/javascript/tools/debugger/build.xml 2011-09-14 17:37:15.175031989 +0200
@@ -38,7 +38,7 @@
-
@@ -46,9 +46,9 @@
-
-
-
+
+
+
@@ -56,58 +56,58 @@
-
+
import java.awt.Component;
-package org.mozilla.javascript.tools.debugger.downloaded;
+package org.mozilla.javascript.tools.debugger.treetable;
-
+
import java.awt.event.*;
-
+
import java.awt.AWTEvent;
-
+
import java.io.Serializable;
-
+
import javax.swing.*;
- package org.mozilla.javascript.tools.debugger.downloaded;
+ package org.mozilla.javascript.tools.debugger.treetable;
import javax.swing.*;
-
+
class ListToTreeSelectionModelWrapper
public class ListToTreeSelectionModelWrapper
-
+
ListSelectionModel getListSelectionModel
public ListSelectionModel getListSelectionModel
-
+
import java.awt.Rectangle;
-
+
import javax.swing.tree.TreeModel;
- package org.mozilla.javascript.tools.debugger.downloaded;
+ package org.mozilla.javascript.tools.debugger.treetable;
import javax.swing.tree.TreeModel;
-
+
import javax.swing.JTree;
- package org.mozilla.javascript.tools.debugger.downloaded;
+ package org.mozilla.javascript.tools.debugger.treetable;
import javax.swing.JTree;
-
+
diff -up rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.build rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
--- rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.build 2011-05-09 20:04:36.000000000 +0200
+++ rhino1_7R3/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2011-09-14 17:37:15.170031993 +0200
@@ -67,7 +67,7 @@ public class JavaPolicySecurity extends
return super.defineClass(name, data, 0, data.length, domain);
}
- public void linkClass(Class> cl) {
+ public void linkClass(Class cl) {
resolveClass(cl);
}
}
diff -up rhino1_7R3/xmlimplsrc/build.xml.build rhino1_7R3/xmlimplsrc/build.xml
diff -up rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.build rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
--- rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.build 2011-05-09 20:04:38.000000000 +0200
+++ rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java 2011-09-14 17:37:15.171031993 +0200
@@ -120,7 +120,7 @@ class Namespace extends IdScriptableObje
}
@Override
- public Object getDefaultValue(Class> hint) {
+ public Object getDefaultValue(Class hint) {
return uri();
}
diff -up rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.build rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
--- rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.build 2011-05-09 20:04:38.000000000 +0200
+++ rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java 2011-09-14 17:37:15.172031992 +0200
@@ -150,7 +150,7 @@ final class QName extends IdScriptableOb
}
@Override
- public Object getDefaultValue(Class> hint) {
+ public Object getDefaultValue(Class hint) {
return toString();
}
diff -up rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.build rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
--- rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.build 2011-05-09 20:04:38.000000000 +0200
+++ rhino1_7R3/xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java 2011-09-14 17:37:15.173031991 +0200
@@ -165,7 +165,7 @@ abstract class XMLObjectImpl extends XML
}
@Override
- public final Object getDefaultValue(Class> hint) {
+ public final Object getDefaultValue(Class hint) {
return this.toString();
}