1.1 --- a/src/jdk/nashorn/internal/runtime/ListAdapter.java Thu Mar 13 15:58:24 2014 +0530
1.2 +++ b/src/jdk/nashorn/internal/runtime/ListAdapter.java Mon Mar 17 18:02:00 2014 +0530
1.3 @@ -34,6 +34,7 @@
1.4 import java.util.concurrent.Callable;
1.5 import jdk.nashorn.api.scripting.JSObject;
1.6 import jdk.nashorn.api.scripting.ScriptObjectMirror;
1.7 +import jdk.nashorn.internal.objects.Global;
1.8 import jdk.nashorn.internal.runtime.linker.Bootstrap;
1.9 import jdk.nashorn.internal.runtime.linker.InvokeByName;
1.10
1.11 @@ -54,7 +55,7 @@
1.12 // These add to the back and front of the list
1.13 private static final Object PUSH = new Object();
1.14 private static InvokeByName getPUSH() {
1.15 - return ((GlobalObject)Context.getGlobal()).getInvokeByName(PUSH,
1.16 + return Context.getGlobal().getInvokeByName(PUSH,
1.17 new Callable<InvokeByName>() {
1.18 @Override
1.19 public InvokeByName call() {
1.20 @@ -65,7 +66,7 @@
1.21
1.22 private static final Object UNSHIFT = new Object();
1.23 private static InvokeByName getUNSHIFT() {
1.24 - return ((GlobalObject)Context.getGlobal()).getInvokeByName(UNSHIFT,
1.25 + return Context.getGlobal().getInvokeByName(UNSHIFT,
1.26 new Callable<InvokeByName>() {
1.27 @Override
1.28 public InvokeByName call() {
1.29 @@ -77,7 +78,7 @@
1.30 // These remove from the back and front of the list
1.31 private static final Object POP = new Object();
1.32 private static InvokeByName getPOP() {
1.33 - return ((GlobalObject)Context.getGlobal()).getInvokeByName(POP,
1.34 + return Context.getGlobal().getInvokeByName(POP,
1.35 new Callable<InvokeByName>() {
1.36 @Override
1.37 public InvokeByName call() {
1.38 @@ -88,7 +89,7 @@
1.39
1.40 private static final Object SHIFT = new Object();
1.41 private static InvokeByName getSHIFT() {
1.42 - return ((GlobalObject)Context.getGlobal()).getInvokeByName(SHIFT,
1.43 + return Context.getGlobal().getInvokeByName(SHIFT,
1.44 new Callable<InvokeByName>() {
1.45 @Override
1.46 public InvokeByName call() {
1.47 @@ -100,7 +101,7 @@
1.48 // These insert and remove in the middle of the list
1.49 private static final Object SPLICE_ADD = new Object();
1.50 private static InvokeByName getSPLICE_ADD() {
1.51 - return ((GlobalObject)Context.getGlobal()).getInvokeByName(SPLICE_ADD,
1.52 + return Context.getGlobal().getInvokeByName(SPLICE_ADD,
1.53 new Callable<InvokeByName>() {
1.54 @Override
1.55 public InvokeByName call() {
1.56 @@ -111,7 +112,7 @@
1.57
1.58 private static final Object SPLICE_REMOVE = new Object();
1.59 private static InvokeByName getSPLICE_REMOVE() {
1.60 - return ((GlobalObject)Context.getGlobal()).getInvokeByName(SPLICE_REMOVE,
1.61 + return Context.getGlobal().getInvokeByName(SPLICE_REMOVE,
1.62 new Callable<InvokeByName>() {
1.63 @Override
1.64 public InvokeByName call() {
