diff options
author | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 00:16:53 +0100 |
---|---|---|
committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-22 00:16:53 +0100 |
commit | fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7 (patch) | |
tree | 928419d6bfe794865e4b8f0634bd792f795c4b8a /trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk15/VMBridge_jdk15.java | |
parent | 0fdab3db005c4fa31fb8306b573c0b35073d3e56 (diff) | |
parent | d56b9b3b82cdebcaeb00eec0fcb4326ad21adaa8 (diff) | |
download | etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.gz etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.tar.xz etherpad-fc00cfedd6c25d1634a1e0d28a7b7bc5f42e1cd7.zip |
Merge branch 'master' into plugin-framework
Diffstat (limited to 'trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk15/VMBridge_jdk15.java')
-rw-r--r-- | trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk15/VMBridge_jdk15.java | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk15/VMBridge_jdk15.java b/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk15/VMBridge_jdk15.java deleted file mode 100644 index 0ffaf9d..0000000 --- a/trunk/infrastructure/rhino1_7R1/src/org/mozilla/javascript/jdk15/VMBridge_jdk15.java +++ /dev/null @@ -1,87 +0,0 @@ -/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Rhino code, released - * May 6, 1999. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1997-2000 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * the GNU General Public License Version 2 or later (the "GPL"), in which - * case the provisions of the GPL are applicable instead of those above. If - * you wish to allow use of your version of this file only under the terms of - * the GPL and not to allow others to use your version of this file under the - * MPL, indicate your decision by deleting the provisions above and replacing - * them with the notice and other provisions required by the GPL. If you do - * not delete the provisions above, a recipient may use your version of this - * file under either the MPL or the GPL. - * - * ***** END LICENSE BLOCK ***** */ - -package org.mozilla.javascript.jdk15; - -import java.lang.reflect.Member; -import java.lang.reflect.Method; -import java.lang.reflect.Constructor; -import java.util.Iterator; -import org.mozilla.javascript.*; - -public class VMBridge_jdk15 extends org.mozilla.javascript.jdk13.VMBridge_jdk13 -{ - public VMBridge_jdk15() throws SecurityException, InstantiationException { - try { - // Just try and see if we can access the isVarArgs method. - // We want to fail loading if the method does not exist - // so that we can load a bridge to an older JDK instead. - Method.class.getMethod("isVarArgs", (Class[]) null); - } catch (NoSuchMethodException e) { - // Throw a fitting exception that is handled by - // org.mozilla.javascript.Kit.newInstanceOrNull: - throw new InstantiationException(e.getMessage()); - } - } - - public boolean isVarArgs(Member member) { - if (member instanceof Method) - return ((Method) member).isVarArgs(); - else if (member instanceof Constructor) - return ((Constructor) member).isVarArgs(); - else - return false; - } - - /** - * If "obj" is a java.util.Iterator or a java.lang.Iterable, return a - * wrapping as a JavaScript Iterator. Otherwise, return null. - * This method is in VMBridge since Iterable is a JDK 1.5 addition. - */ - public Iterator getJavaIterator(Context cx, Scriptable scope, Object obj) { - if (obj instanceof Wrapper) { - Object unwrapped = ((Wrapper) obj).unwrap(); - Iterator iterator = null; - if (unwrapped instanceof Iterator) - iterator = (Iterator) unwrapped; - if (unwrapped instanceof Iterable) - iterator = ((Iterable)unwrapped).iterator(); - return iterator; - } - return null; - } -} |