cjolif 2003/07/01 05:09:11
Modified: sources/org/apache/batik/script/rhino
EventTargetWrapper.java WindowWrapper.java
Log:
remove deprecation warnings with Rhino
Revision Changes Path
1.8 +5 -11
xml-batik/sources/org/apache/batik/script/rhino/EventTargetWrapper.java
Index: EventTargetWrapper.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/script/rhino/EventTargetWrapper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EventTargetWrapper.java 11 Apr 2003 13:58:59 -0000 1.7
+++ EventTargetWrapper.java 1 Jul 2003 12:09:11 -0000 1.8
@@ -101,8 +101,7 @@
Class[] paramTypes = { String.class, Function.class,
Boolean.TYPE };
for (int i = 0; i < args.length; i++)
- args[i] = NativeJavaObject.coerceType(paramTypes[i],
- args[i]);
+ args[i] = Context.toType(args[i], paramTypes[i]);
((EventTarget)unwrap()).
addEventListener((String)args[0],
evtListener,
@@ -114,9 +113,7 @@
Class[] paramTypes = { String.class, Function.class,
Boolean.TYPE };
for (int i = 0; i < args.length; i++)
- args[i] =
- NativeJavaObject.coerceType(paramTypes[i],
- args[i]);
+ args[i] = Context.toType(args[i], paramTypes[i]);
((EventTarget)unwrap()).
removeEventListener((String)args[0],
(EventListener)listenerMap.
@@ -138,8 +135,7 @@
Class[] paramTypes = { String.class, Scriptable.class,
Boolean.TYPE };
for (int i = 0; i < args.length; i++)
- args[i] = NativeJavaObject.coerceType(paramTypes[i],
- args[i]);
+ args[i] = Context.toType(args[i], paramTypes[i]);
((EventTarget)unwrap()).
addEventListener((String)args[0],
evtListener,
@@ -151,9 +147,7 @@
Class[] paramTypes = { String.class, Scriptable.class,
Boolean.TYPE };
for (int i = 0; i < args.length; i++)
- args[i] =
- NativeJavaObject.coerceType(paramTypes[i],
- args[i]);
+ args[i] = Context.toType(args[i], paramTypes[i]);
((EventTarget)unwrap()).
removeEventListener((String)args[0],
(EventListener)listenerMap.
1.14 +16 -20
xml-batik/sources/org/apache/batik/script/rhino/WindowWrapper.java
Index: WindowWrapper.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/script/rhino/WindowWrapper.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WindowWrapper.java 11 Apr 2003 13:58:59 -0000 1.13
+++ WindowWrapper.java 1 Jul 2003 12:09:11 -0000 1.14
@@ -87,8 +87,7 @@
if (len < 2) {
throw Context.reportRuntimeError("invalid argument count");
}
- long to = ((Long)NativeJavaObject.coerceType
- (Long.TYPE, args[1])).longValue();
+ long to = ((Long)Context.toType(args[1], Long.TYPE)).longValue();
if (args[0] instanceof Function) {
RhinoInterpreter interp =
(RhinoInterpreter)window.getInterpreter();
@@ -98,7 +97,7 @@
return window.setInterval(fw, to);
}
String script =
- (String)NativeJavaObject.coerceType(String.class, args[0]);
+ (String)Context.toType(args[0], String.class);
return window.setInterval(script, to);
}
@@ -116,8 +115,7 @@
if (len < 2) {
throw Context.reportRuntimeError("invalid argument count");
}
- long to = ((Long)NativeJavaObject.coerceType
- (Long.TYPE, args[1])).longValue();
+ long to = ((Long)Context.toType(args[1], Long.TYPE)).longValue();
if (args[0] instanceof Function) {
RhinoInterpreter interp =
(RhinoInterpreter)window.getInterpreter();
@@ -127,7 +125,7 @@
return window.setTimeout(fw, to);
}
String script =
- (String)NativeJavaObject.coerceType(String.class, args[0]);
+ (String)Context.toType(args[0], String.class);
return window.setTimeout(script, to);
}
@@ -143,8 +141,7 @@
WindowWrapper ww = (WindowWrapper)thisObj;
Window window = ww.window;
if (len >= 1) {
- window.clearInterval(NativeJavaObject.coerceType
- (Object.class, args[0]));
+ window.clearInterval(Context.toType(args[0], Object.class));
}
}
@@ -160,8 +157,7 @@
WindowWrapper ww = (WindowWrapper)thisObj;
Window window = ww.window;
if (len >= 1) {
- window.clearTimeout(NativeJavaObject.coerceType
- (Object.class, args[0]));
+ window.clearTimeout(Context.toType(args[0], Object.class));
}
}
@@ -186,8 +182,8 @@
return AccessController.doPrivileged( new PrivilegedAction() {
public Object run() {
return window.parseXML
- ((String)NativeJavaObject.coerceType(String.class, args[0]),
- (Document)NativeJavaObject.coerceType(Document.class,
args[1]));
+ ((String)Context.toType(args[0], String.class),
+ (Document)Context.toType(args[1], Document.class));
}
}, acc);
}
@@ -208,7 +204,7 @@
}
RhinoInterpreter interp =
(RhinoInterpreter)window.getInterpreter();
- final String uri = (String)NativeJavaObject.coerceType(String.class,
args[0]);
+ final String uri = (String)Context.toType(args[0], String.class);
Window.GetURLHandler urlHandler = null;
if (args[1] instanceof Function) {
urlHandler = new GetURLFunctionWrapper(interp, (Function)args[1], ww);
@@ -232,7 +228,7 @@
public Object run() {
window.getURL
(uri, fw,
- (String)NativeJavaObject.coerceType(String.class,
args[2]));
+ (String)Context.toType(args[2], String.class));
return null;
}
}, acc);
@@ -252,7 +248,7 @@
Window window = ww.window;
if (len >= 1) {
String message =
- (String)NativeJavaObject.coerceType(String.class, args[0]);
+ (String)Context.toType(args[0], String.class);
window.alert(message);
}
}
@@ -270,7 +266,7 @@
Window window = ww.window;
if (len >= 1) {
String message =
- (String)NativeJavaObject.coerceType(String.class, args[0]);
+ (String)Context.toType(args[0], String.class);
return window.confirm(message);
}
return false;
@@ -293,14 +289,14 @@
case 1:
String message =
- (String)NativeJavaObject.coerceType(String.class, args[0]);
+ (String)Context.toType(args[0], String.class);
return window.prompt(message);
default:
message =
- (String)NativeJavaObject.coerceType(String.class, args[0]);
+ (String)Context.toType(args[0], String.class);
String defVal =
- (String)NativeJavaObject.coerceType(String.class, args[1]);
+ (String)Context.toType(args[1], String.class);
return window.prompt(message, defVal);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
