f8bb4c968b
Copy from Java:packages/rhino based on submit request 24642 from user mvyskocil OBS-URL: https://build.opensuse.org/request/show/24642 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rhino?expand=0&rev=6
113 lines
4.7 KiB
Diff
113 lines
4.7 KiB
Diff
Index: examples/Matrix.java
|
|
===================================================================
|
|
--- examples/Matrix.java.orig 2009-11-16 15:55:50.618560322 +0100
|
|
+++ examples/Matrix.java 2009-11-16 15:56:33.046061289 +0100
|
|
@@ -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]";
|
|
}
|
|
|
|
Index: examples/PrimitiveWrapFactory.java
|
|
===================================================================
|
|
--- examples/PrimitiveWrapFactory.java.orig 2009-11-16 15:55:50.618560322 +0100
|
|
+++ examples/PrimitiveWrapFactory.java 2009-11-16 15:56:33.046061289 +0100
|
|
@@ -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)
|
|
Index: src/org/mozilla/javascript/WrapFactory.java
|
|
===================================================================
|
|
--- src/org/mozilla/javascript/WrapFactory.java.orig 2009-11-16 15:55:50.618560322 +0100
|
|
+++ src/org/mozilla/javascript/WrapFactory.java 2009-11-16 15:56:33.082060680 +0100
|
|
@@ -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)
|
|
Index: toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
|
|
===================================================================
|
|
--- toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java.orig 2009-11-16 15:55:50.622561663 +0100
|
|
+++ toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java 2009-11-16 15:56:33.106060535 +0100
|
|
@@ -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);
|
|
}
|
|
}
|
|
Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java
|
|
===================================================================
|
|
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java.orig 2009-11-16 15:55:50.622561663 +0100
|
|
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/Namespace.java 2009-11-16 15:56:33.130060740 +0100
|
|
@@ -115,7 +115,7 @@
|
|
}
|
|
|
|
@Override
|
|
- public Object getDefaultValue(Class<?> hint) {
|
|
+ public Object getDefaultValue(Class hint) {
|
|
return uri();
|
|
}
|
|
|
|
Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
|
|
===================================================================
|
|
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java.orig 2009-11-16 15:55:50.622561663 +0100
|
|
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java 2009-11-16 15:56:33.182060668 +0100
|
|
@@ -145,7 +145,7 @@
|
|
}
|
|
|
|
@Override
|
|
- public Object getDefaultValue(Class<?> hint) {
|
|
+ public Object getDefaultValue(Class hint) {
|
|
return toString();
|
|
}
|
|
|
|
Index: xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java
|
|
===================================================================
|
|
--- xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java.orig 2009-11-16 15:55:50.622561663 +0100
|
|
+++ xmlimplsrc/org/mozilla/javascript/xmlimpl/XMLObjectImpl.java 2009-11-16 15:56:33.206060612 +0100
|
|
@@ -165,7 +165,7 @@
|
|
}
|
|
|
|
@Override
|
|
- public final Object getDefaultValue(Class<?> hint) {
|
|
+ public final Object getDefaultValue(Class hint) {
|
|
return this.toString();
|
|
}
|
|
|
|
Index: toolsrc/org/mozilla/javascript/tools/shell/Main.java
|
|
===================================================================
|
|
--- toolsrc/org/mozilla/javascript/tools/shell/Main.java.orig 2009-11-16 15:55:50.622561663 +0100
|
|
+++ toolsrc/org/mozilla/javascript/tools/shell/Main.java 2009-11-16 15:56:33.234061036 +0100
|
|
@@ -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;
|
|
@@ -64,6 +66,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;
|
|
|