--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineSecurityTest.java Wed Apr 02 10:52:39 2014 +0200
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineSecurityTest.java Fri Apr 11 16:52:14 2014 +0200
@@ -42,7 +42,7 @@
*/
public class ScriptEngineSecurityTest {
- private void log(String msg) {
+ private void log(final String msg) {
org.testng.Reporter.log(msg, true);
}
@@ -185,8 +185,8 @@
// put an empty script object into array
e.eval("holder[0] = {}");
// holder[0] is an object of some subclass of ScriptObject
- Class ScriptObjectClass = holder[0].getClass().getSuperclass();
- Class PropertyAccessClass = ScriptObjectClass.getInterfaces()[0];
+ final Class<?> ScriptObjectClass = holder[0].getClass().getSuperclass();
+ final Class<?> PropertyAccessClass = ScriptObjectClass.getInterfaces()[0];
// implementation methods for PropertyAccess class
e.eval("function set() {}; function get() {}; function getInt(){} " +
"function getDouble(){}; function getLong() {}; " +
@@ -206,11 +206,11 @@
// @bug 8032948: Nashorn linkages awry
public static class FakeProxy extends Proxy {
- public FakeProxy(InvocationHandler ih) {
+ public FakeProxy(final InvocationHandler ih) {
super(ih);
}
- public static Class<?> makeProxyClass(ClassLoader cl, Class<?>... ifaces) {
+ public static Class<?> makeProxyClass(final ClassLoader cl, final Class<?>... ifaces) {
return Proxy.getProxyClass(cl, ifaces);
}
}
@@ -229,11 +229,11 @@
e.put("cl", ScriptEngineSecurityTest.class.getClassLoader());
e.put("intfs", new Class[] { Runnable.class });
- String getClass = "Java.type(name + '$FakeProxy').getProxyClass(cl, intfs);";
+ final String getClass = "Java.type(name + '$FakeProxy').getProxyClass(cl, intfs);";
// Should not be able to call static methods of Proxy via fake subclass
try {
- Class c = (Class)e.eval(getClass);
+ final Class<?> c = (Class<?>)e.eval(getClass);
fail("should have thrown SecurityException");
} catch (final Exception exp) {
if (! (exp instanceof SecurityException)) {
@@ -256,11 +256,11 @@
e.put("cl", ScriptEngineSecurityTest.class.getClassLoader());
e.put("intfs", new Class[] { Runnable.class });
- String getClass = "Java.type(name + '$FakeProxy').makeProxyClass(cl, intfs);";
+ final String getClass = "Java.type(name + '$FakeProxy').makeProxyClass(cl, intfs);";
// Should not be able to call static methods of Proxy via fake subclass
try {
- Class c = (Class)e.eval(getClass);
+ final Class<?> c = (Class<?>)e.eval(getClass);
fail("should have thrown SecurityException");
} catch (final Exception exp) {
if (! (exp instanceof SecurityException)) {
@@ -278,7 +278,7 @@
new Class[] { Runnable.class },
new InvocationHandler() {
@Override
- public Object invoke(Object p, Method m, Object[] a) {
+ public Object invoke(final Object p, final Method m, final Object[] a) {
return null;
}
});