author | erikj |
Tue, 12 Sep 2017 19:03:39 +0200 | |
changeset 47216 | 71c04702a3d5 |
parent 34447 | nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/NativeJavaPackage.java@ec4c069f9436 |
permissions | -rw-r--r-- |
16147 | 1 |
/* |
16151 | 2 |
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
16147 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
package jdk.nashorn.internal.runtime; |
|
27 |
||
26067
b32ccc3a76c9
8055199: Tidy up Nashorn codebase for code standards (August 2014)
attila
parents:
25252
diff
changeset
|
28 |
import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; |
24719 | 29 |
import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid; |
30 |
||
17760
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
31 |
import java.lang.invoke.MethodHandle; |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
32 |
import java.lang.invoke.MethodHandles; |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
33 |
import java.lang.invoke.MethodType; |
34447
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33690
diff
changeset
|
34 |
import jdk.dynalink.CallSiteDescriptor; |
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33690
diff
changeset
|
35 |
import jdk.dynalink.beans.BeansLinker; |
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33690
diff
changeset
|
36 |
import jdk.dynalink.beans.StaticClass; |
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33690
diff
changeset
|
37 |
import jdk.dynalink.linker.GuardedInvocation; |
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33690
diff
changeset
|
38 |
import jdk.dynalink.linker.LinkRequest; |
ec4c069f9436
8141338: Move jdk.internal.dynalink package to jdk.dynalink
attila
parents:
33690
diff
changeset
|
39 |
import jdk.dynalink.linker.support.Guards; |
17760
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
40 |
import jdk.nashorn.internal.lookup.MethodHandleFactory; |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
41 |
import jdk.nashorn.internal.lookup.MethodHandleFunctionality; |
16147 | 42 |
import jdk.nashorn.internal.objects.annotations.Attribute; |
43 |
import jdk.nashorn.internal.objects.annotations.Function; |
|
33343
23abd10384a5
8139931: Introduce Operation objects in Dynalink instead of string encoding
attila
parents:
33337
diff
changeset
|
44 |
import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor; |
16147 | 45 |
|
46 |
/** |
|
47 |
* An object that exposes Java packages and classes as its properties. Packages are exposed as objects that have further |
|
48 |
* sub-packages and classes as their properties. Normally, three instances of this class are exposed as built-in objects |
|
49 |
* in Nashorn: {@code "Packages"}, {@code "java"}, and {@code "javax"}. Typical usages are: |
|
50 |
* <pre> |
|
51 |
* var list = new java.util.ArrayList() |
|
52 |
* var sprocket = new Packages.com.acme.Sprocket() |
|
53 |
* </pre> |
|
54 |
* or you can store the type objects in a variable for later reuse: |
|
55 |
* <pre> |
|
56 |
* var ArrayList = java.util.ArrayList |
|
57 |
* var list = new ArrayList |
|
58 |
* </pre> |
|
23375
a1110f2cbe75
8037400: Remove getInitialMap getters and GlobalObject interface
sundar
parents:
22669
diff
changeset
|
59 |
* You can also use {@link jdk.nashorn.internal.objects.NativeJava#type(Object, Object)} to access Java classes. These two statements are mostly |
16147 | 60 |
* equivalent: |
61 |
* <pre> |
|
62 |
* var listType1 = java.util.ArrayList |
|
63 |
* var listType2 = Java.type("java.util.ArrayList") |
|
64 |
* </pre> |
|
65 |
* The difference is that {@code Java.type()} will throw an error if the class does not exist, while the first |
|
66 |
* expression will return an empty object, as it must treat all non-existent classes as potentially being further |
|
67 |
* subpackages. As such, {@code Java.type()} has the potential to catch typos earlier. A further difference is that |
|
68 |
* {@code Java.type()} doesn't recognize {@code .} (dot) as the separator between outer class name and inner class name, |
|
69 |
* it only recognizes the dollar sign. These are equivalent: |
|
70 |
* <pre> |
|
71 |
* var ftype1 = java.awt.geom.Arc2D$Float |
|
72 |
* var ftype2 = java.awt.geom.Arc2D.Float |
|
73 |
* var ftype3 = Java.asType("java.awt.geom.Arc2D$Float") |
|
74 |
* var ftype4 = Java.asType("java.awt.geom.Arc2D").Float |
|
75 |
* </pre> |
|
76 |
*/ |
|
16226
0e4f37e6cc40
8007915: Nashorn IR, codegen, parser packages and Context instance should be inaccessible to user code
sundar
parents:
16195
diff
changeset
|
77 |
public final class NativeJavaPackage extends ScriptObject { |
17760
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
78 |
private static final MethodHandleFunctionality MH = MethodHandleFactory.getFunctionality(); |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
79 |
private static final MethodHandle CLASS_NOT_FOUND = findOwnMH("classNotFound", Void.TYPE, NativeJavaPackage.class); |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
80 |
private static final MethodHandle TYPE_GUARD = Guards.getClassGuard(NativeJavaPackage.class); |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
81 |
|
16147 | 82 |
/** Full name of package (includes path.) */ |
83 |
private final String name; |
|
84 |
||
85 |
/** |
|
86 |
* Public constructor to be accessible from {@link jdk.nashorn.internal.objects.Global} |
|
87 |
* @param name package name |
|
88 |
* @param proto proto |
|
89 |
*/ |
|
90 |
public NativeJavaPackage(final String name, final ScriptObject proto) { |
|
19085
066c9e5afd79
8020731: Revisit checkPermission calls in Context class
sundar
parents:
18328
diff
changeset
|
91 |
super(proto, null); |
22669 | 92 |
// defense-in-path, check here for sensitive packages |
93 |
Context.checkPackageAccess(name); |
|
16147 | 94 |
this.name = name; |
95 |
} |
|
96 |
||
97 |
@Override |
|
98 |
public String getClassName() { |
|
99 |
return "JavaPackage"; |
|
100 |
} |
|
101 |
||
102 |
@Override |
|
103 |
public boolean equals(final Object other) { |
|
104 |
if (other instanceof NativeJavaPackage) { |
|
105 |
return name.equals(((NativeJavaPackage)other).name); |
|
106 |
} |
|
107 |
return false; |
|
108 |
} |
|
109 |
||
110 |
@Override |
|
111 |
public int hashCode() { |
|
112 |
return name == null ? 0 : name.hashCode(); |
|
113 |
} |
|
114 |
||
115 |
/** |
|
116 |
* Get the full name of the package |
|
117 |
* @return the name |
|
118 |
*/ |
|
119 |
public String getName() { |
|
120 |
return name; |
|
121 |
} |
|
122 |
||
123 |
@Override |
|
124 |
public String safeToString() { |
|
125 |
return toString(); |
|
126 |
} |
|
127 |
||
128 |
@Override |
|
129 |
public String toString() { |
|
130 |
return "[JavaPackage " + name + "]"; |
|
131 |
} |
|
132 |
||
133 |
@Override |
|
134 |
public Object getDefaultValue(final Class<?> hint) { |
|
135 |
if (hint == String.class) { |
|
136 |
return toString(); |
|
137 |
} |
|
138 |
||
139 |
return super.getDefaultValue(hint); |
|
140 |
} |
|
141 |
||
17760
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
142 |
@Override |
24738
be2026c9717c
8039746: Transform applies to calls wherever possible, for ScriptFunctions and JSObjects.
lagergren
parents:
24727
diff
changeset
|
143 |
protected GuardedInvocation findNewMethod(final CallSiteDescriptor desc, final LinkRequest request) { |
17760
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
144 |
return createClassNotFoundInvocation(desc); |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
145 |
} |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
146 |
|
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
147 |
@Override |
24738
be2026c9717c
8039746: Transform applies to calls wherever possible, for ScriptFunctions and JSObjects.
lagergren
parents:
24727
diff
changeset
|
148 |
protected GuardedInvocation findCallMethod(final CallSiteDescriptor desc, final LinkRequest request) { |
17760
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
149 |
return createClassNotFoundInvocation(desc); |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
150 |
} |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
151 |
|
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
152 |
private static GuardedInvocation createClassNotFoundInvocation(final CallSiteDescriptor desc) { |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
153 |
// If NativeJavaPackage is invoked either as a constructor or as a function, throw a ClassNotFoundException as |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
154 |
// we can assume the user attempted to instantiate a non-existent class. |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
155 |
final MethodType type = desc.getMethodType(); |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
156 |
return new GuardedInvocation( |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
157 |
MH.dropArguments(CLASS_NOT_FOUND, 1, type.parameterList().subList(1, type.parameterCount())), |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
158 |
type.parameterType(0) == NativeJavaPackage.class ? null : TYPE_GUARD); |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
159 |
} |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
160 |
|
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
161 |
@SuppressWarnings("unused") |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
162 |
private static void classNotFound(final NativeJavaPackage pkg) throws ClassNotFoundException { |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
163 |
throw new ClassNotFoundException(pkg.name); |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
164 |
} |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
165 |
|
16147 | 166 |
/** |
167 |
* "No such property" call placeholder. |
|
168 |
* |
|
169 |
* This can never be called as we override {@link ScriptObject#noSuchProperty}. We do declare it here as it's a signal |
|
170 |
* to {@link WithObject} that it's worth trying doing a {@code noSuchProperty} on this object. |
|
171 |
* |
|
172 |
* @param self self reference |
|
173 |
* @param name property name |
|
174 |
* @return never returns |
|
175 |
*/ |
|
176 |
@Function(attributes = Attribute.NOT_ENUMERABLE) |
|
177 |
public static Object __noSuchProperty__(final Object self, final Object name) { |
|
178 |
throw new AssertionError("__noSuchProperty__ placeholder called"); |
|
179 |
} |
|
180 |
||
181 |
/** |
|
182 |
* "No such method call" placeholder |
|
183 |
* |
|
184 |
* This can never be called as we override {@link ScriptObject#noSuchMethod}. We do declare it here as it's a signal |
|
185 |
* to {@link WithObject} that it's worth trying doing a noSuchProperty on this object. |
|
186 |
* |
|
187 |
* @param self self reference |
|
188 |
* @param args arguments to method |
|
189 |
* @return never returns |
|
190 |
*/ |
|
191 |
@Function(attributes = Attribute.NOT_ENUMERABLE) |
|
192 |
public static Object __noSuchMethod__(final Object self, final Object... args) { |
|
193 |
throw new AssertionError("__noSuchMethod__ placeholder called"); |
|
194 |
} |
|
195 |
||
196 |
/** |
|
197 |
* Handle creation of new attribute. |
|
198 |
* @param desc the call site descriptor |
|
16195
3f6c0ab2597a
8006766: Array-like access to characters of a string is slow
hannesw
parents:
16151
diff
changeset
|
199 |
* @param request the link request |
16147 | 200 |
* @return Link to be invoked at call site. |
201 |
*/ |
|
202 |
@Override |
|
16195
3f6c0ab2597a
8006766: Array-like access to characters of a string is slow
hannesw
parents:
16151
diff
changeset
|
203 |
public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc, final LinkRequest request) { |
33343
23abd10384a5
8139931: Introduce Operation objects in Dynalink instead of string encoding
attila
parents:
33337
diff
changeset
|
204 |
final String propertyName = NashornCallSiteDescriptor.getOperand(desc); |
22386
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
205 |
createProperty(propertyName); |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
206 |
return super.lookup(desc, request); |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
207 |
} |
16147 | 208 |
|
22386
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
209 |
@Override |
33690 | 210 |
protected Object invokeNoSuchProperty(final Object key, final boolean isScope, final int programPoint) { |
211 |
if (!(key instanceof String)) { |
|
212 |
return super.invokeNoSuchProperty(key, isScope, programPoint); |
|
213 |
} |
|
214 |
final Object retval = createProperty((String) key); |
|
24719 | 215 |
if (isValid(programPoint)) { |
216 |
throw new UnwarrantedOptimismException(retval, programPoint); |
|
217 |
} |
|
218 |
return retval; |
|
16147 | 219 |
} |
220 |
||
221 |
@Override |
|
16195
3f6c0ab2597a
8006766: Array-like access to characters of a string is slow
hannesw
parents:
16151
diff
changeset
|
222 |
public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc, final LinkRequest request) { |
3f6c0ab2597a
8006766: Array-like access to characters of a string is slow
hannesw
parents:
16151
diff
changeset
|
223 |
return noSuchProperty(desc, request); |
16147 | 224 |
} |
225 |
||
17760
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
226 |
private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) { |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
227 |
return MH.findStatic(MethodHandles.lookup(), NativeJavaPackage.class, name, MH.type(rtype, types)); |
8051da1045fb
8014953: Have NativeJavaPackage throw a ClassNotFoundException when invoked
attila
parents:
17235
diff
changeset
|
228 |
} |
22386
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
229 |
|
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
230 |
private Object createProperty(final String propertyName) { |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
231 |
final String fullName = name.isEmpty() ? propertyName : name + "." + propertyName; |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
232 |
final Context context = Context.getContextTrusted(); |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
233 |
|
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
234 |
Class<?> javaClass = null; |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
235 |
try { |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
236 |
javaClass = context.findClass(fullName); |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
237 |
} catch (final NoClassDefFoundError | ClassNotFoundException e) { |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
238 |
//ignored |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
239 |
} |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
240 |
|
25252
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
241 |
// Check for explicit constructor signature use |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
242 |
// Example: new (java.awt["Color(int, int,int)"])(2, 3, 4); |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
243 |
final int openBrace = propertyName.indexOf('('); |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
244 |
final int closeBrace = propertyName.lastIndexOf(')'); |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
245 |
if (openBrace != -1 || closeBrace != -1) { |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
246 |
final int lastChar = propertyName.length() - 1; |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
247 |
if (openBrace == -1 || closeBrace != lastChar) { |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
248 |
throw typeError("improper.constructor.signature", propertyName); |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
249 |
} |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
250 |
|
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
251 |
// get the class name and try to load it |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
252 |
final String className = name + "." + propertyName.substring(0, openBrace); |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
253 |
try { |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
254 |
javaClass = context.findClass(className); |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
255 |
} catch (final NoClassDefFoundError | ClassNotFoundException e) { |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
256 |
throw typeError(e, "no.such.java.class", className); |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
257 |
} |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
258 |
|
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
259 |
// try to find a matching constructor |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
260 |
final Object constructor = BeansLinker.getConstructorMethod( |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
261 |
javaClass, propertyName.substring(openBrace + 1, lastChar)); |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
262 |
if (constructor != null) { |
26765
97501edd2979
8047764: Indexed or polymorphic set on global affects Object.prototype
hannesw
parents:
26068
diff
changeset
|
263 |
set(propertyName, constructor, 0); |
25252
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
264 |
return constructor; |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
265 |
} |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
266 |
// we didn't find a matching constructor! |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
267 |
throw typeError("no.such.java.constructor", propertyName); |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
268 |
} |
e8bfc909db53
8043232: Index selection of overloaded java new constructors
sundar
parents:
24738
diff
changeset
|
269 |
|
22386
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
270 |
final Object propertyValue; |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
271 |
if (javaClass == null) { |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
272 |
propertyValue = new NativeJavaPackage(fullName, getProto()); |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
273 |
} else { |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
274 |
propertyValue = StaticClass.forClass(javaClass); |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
275 |
} |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
276 |
|
26765
97501edd2979
8047764: Indexed or polymorphic set on global affects Object.prototype
hannesw
parents:
26068
diff
changeset
|
277 |
set(propertyName, propertyValue, 0); |
22386
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
278 |
return propertyValue; |
b421b9049d11
8031715: Indexed access to java package not working
sundar
parents:
19884
diff
changeset
|
279 |
} |
16147 | 280 |
} |