author | mchung |
Tue, 06 Nov 2018 10:01:16 -0800 | |
changeset 52427 | 3c6aa484536c |
parent 52248 | 2e330da7cbf4 |
child 54862 | 3464146f4a1c |
permissions | -rw-r--r-- |
2 | 1 |
/* |
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved. |
2 | 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 |
|
5506 | 7 |
* published by the Free Software Foundation. Oracle designates this |
2 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
2 | 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 |
* |
|
5506 | 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. |
|
2 | 24 |
*/ |
25 |
package java.beans; |
|
26 |
||
13356 | 27 |
import com.sun.beans.TypeResolver; |
4382
c0759b1ccb56
5102804: Memory leak in Introspector.getBeanInfo(Class) for custom BeanInfo: Class param
malenkov
parents:
3476
diff
changeset
|
28 |
import com.sun.beans.WeakCache; |
2 | 29 |
import com.sun.beans.finder.ClassFinder; |
25566
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
30 |
import com.sun.beans.introspect.ClassInfo; |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
31 |
import com.sun.beans.introspect.EventSetInfo; |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
32 |
import com.sun.beans.introspect.PropertyInfo; |
2 | 33 |
|
7249
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
34 |
import java.awt.Component; |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
35 |
|
4851
4f7de5eeeac7
6921057: REGRESSION: persistence delegate issue on Windows and Linux against 5.u23b03/6u17b11
malenkov
parents:
4393
diff
changeset
|
36 |
import java.lang.ref.Reference; |
4f7de5eeeac7
6921057: REGRESSION: persistence delegate issue on Windows and Linux against 5.u23b03/6u17b11
malenkov
parents:
4393
diff
changeset
|
37 |
import java.lang.ref.SoftReference; |
30906
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
38 |
import java.lang.reflect.Constructor; |
42208
7c1017f0ade5
8155874: Fix java.desktop deprecation warnings about Class.newInstance
prr
parents:
35667
diff
changeset
|
39 |
import java.lang.reflect.InvocationTargetException; |
2 | 40 |
import java.lang.reflect.Method; |
13356 | 41 |
import java.lang.reflect.Type; |
2 | 42 |
|
43 |
import java.util.Map; |
|
44 |
import java.util.ArrayList; |
|
45 |
import java.util.HashMap; |
|
46 |
import java.util.Iterator; |
|
7249
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
47 |
import java.util.EventObject; |
2 | 48 |
import java.util.List; |
49 |
import java.util.TreeMap; |
|
3239
f675984c2349
6380849: RFE: Automatic discovery of PersistanceDelegates
malenkov
parents:
2
diff
changeset
|
50 |
|
52427
3c6aa484536c
8211122: Reduce the number of internal classes made accessible to jdk.unsupported
mchung
parents:
52248
diff
changeset
|
51 |
import jdk.internal.access.JavaBeansAccess; |
3c6aa484536c
8211122: Reduce the number of internal classes made accessible to jdk.unsupported
mchung
parents:
52248
diff
changeset
|
52 |
import jdk.internal.access.SharedSecrets; |
2 | 53 |
import sun.reflect.misc.ReflectUtil; |
54 |
||
55 |
/** |
|
56 |
* The Introspector class provides a standard way for tools to learn about |
|
57 |
* the properties, events, and methods supported by a target Java Bean. |
|
58 |
* <p> |
|
59 |
* For each of those three kinds of information, the Introspector will |
|
60 |
* separately analyze the bean's class and superclasses looking for |
|
61 |
* either explicit or implicit information and use that information to |
|
62 |
* build a BeanInfo object that comprehensively describes the target bean. |
|
63 |
* <p> |
|
64 |
* For each class "Foo", explicit information may be available if there exists |
|
65 |
* a corresponding "FooBeanInfo" class that provides a non-null value when |
|
66 |
* queried for the information. We first look for the BeanInfo class by |
|
67 |
* taking the full package-qualified name of the target bean class and |
|
68 |
* appending "BeanInfo" to form a new class name. If this fails, then |
|
69 |
* we take the final classname component of this name, and look for that |
|
70 |
* class in each of the packages specified in the BeanInfo package search |
|
71 |
* path. |
|
72 |
* <p> |
|
73 |
* Thus for a class such as "sun.xyz.OurButton" we would first look for a |
|
74 |
* BeanInfo class called "sun.xyz.OurButtonBeanInfo" and if that failed we'd |
|
75 |
* look in each package in the BeanInfo search path for an OurButtonBeanInfo |
|
76 |
* class. With the default search path, this would mean looking for |
|
77 |
* "sun.beans.infos.OurButtonBeanInfo". |
|
78 |
* <p> |
|
79 |
* If a class provides explicit BeanInfo about itself then we add that to |
|
80 |
* the BeanInfo information we obtained from analyzing any derived classes, |
|
81 |
* but we regard the explicit information as being definitive for the current |
|
82 |
* class and its base classes, and do not proceed any further up the superclass |
|
83 |
* chain. |
|
84 |
* <p> |
|
85 |
* If we don't find explicit BeanInfo on a class, we use low-level |
|
86 |
* reflection to study the methods of the class and apply standard design |
|
87 |
* patterns to identify property accessors, event sources, or public |
|
88 |
* methods. We then proceed to analyze the class's superclass and add |
|
89 |
* in the information from it (and possibly on up the superclass chain). |
|
90 |
* <p> |
|
91 |
* For more information about introspection and design patterns, please |
|
92 |
* consult the |
|
20455
f6f9a0c2796b
8020688: Broken links in documentation at http://docs.oracle.com/javase/6/docs/api/index.
mcherkas
parents:
19213
diff
changeset
|
93 |
* <a href="http://www.oracle.com/technetwork/java/javase/documentation/spec-136004.html">JavaBeans™ specification</a>. |
25130
adfaa02ea516
8044855: Add missing @since tag under java.beans.*
henryjen
parents:
25123
diff
changeset
|
94 |
* |
adfaa02ea516
8044855: Add missing @since tag under java.beans.*
henryjen
parents:
25123
diff
changeset
|
95 |
* @since 1.1 |
2 | 96 |
*/ |
97 |
||
98 |
public class Introspector { |
|
99 |
||
100 |
// Flags that can be used to control getBeanInfo: |
|
19213 | 101 |
/** |
102 |
* Flag to indicate to use of all beaninfo. |
|
25130
adfaa02ea516
8044855: Add missing @since tag under java.beans.*
henryjen
parents:
25123
diff
changeset
|
103 |
* @since 1.2 |
19213 | 104 |
*/ |
32865
f9cb6e427f9e
8136783: Run blessed-modifier-order script on java.desktop
prr
parents:
30906
diff
changeset
|
105 |
public static final int USE_ALL_BEANINFO = 1; |
19213 | 106 |
/** |
107 |
* Flag to indicate to ignore immediate beaninfo. |
|
25130
adfaa02ea516
8044855: Add missing @since tag under java.beans.*
henryjen
parents:
25123
diff
changeset
|
108 |
* @since 1.2 |
19213 | 109 |
*/ |
32865
f9cb6e427f9e
8136783: Run blessed-modifier-order script on java.desktop
prr
parents:
30906
diff
changeset
|
110 |
public static final int IGNORE_IMMEDIATE_BEANINFO = 2; |
19213 | 111 |
/** |
112 |
* Flag to indicate to ignore all beaninfo. |
|
25130
adfaa02ea516
8044855: Add missing @since tag under java.beans.*
henryjen
parents:
25123
diff
changeset
|
113 |
* @since 1.2 |
19213 | 114 |
*/ |
32865
f9cb6e427f9e
8136783: Run blessed-modifier-order script on java.desktop
prr
parents:
30906
diff
changeset
|
115 |
public static final int IGNORE_ALL_BEANINFO = 3; |
2 | 116 |
|
117 |
// Static Caches to speed up introspection. |
|
11086
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
118 |
private static final WeakCache<Class<?>, Method[]> declaredMethodCache = new WeakCache<>(); |
2 | 119 |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
120 |
private Class<?> beanClass; |
2 | 121 |
private BeanInfo explicitBeanInfo; |
122 |
private BeanInfo superBeanInfo; |
|
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
123 |
private BeanInfo[] additionalBeanInfo; |
2 | 124 |
|
125 |
private boolean propertyChangeSource = false; |
|
126 |
||
127 |
// These should be removed. |
|
128 |
private String defaultEventName; |
|
129 |
private String defaultPropertyName; |
|
130 |
private int defaultEventIndex = -1; |
|
131 |
private int defaultPropertyIndex = -1; |
|
132 |
||
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
133 |
// Methods maps from Method names to MethodDescriptors |
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
134 |
private Map<String, MethodDescriptor> methods; |
2 | 135 |
|
136 |
// properties maps from String names to PropertyDescriptors |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
137 |
private Map<String, PropertyDescriptor> properties; |
2 | 138 |
|
139 |
// events maps from String names to EventSetDescriptors |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
140 |
private Map<String, EventSetDescriptor> events; |
2 | 141 |
|
32865
f9cb6e427f9e
8136783: Run blessed-modifier-order script on java.desktop
prr
parents:
30906
diff
changeset
|
142 |
private static final EventSetDescriptor[] EMPTY_EVENTSETDESCRIPTORS = new EventSetDescriptor[0]; |
2 | 143 |
|
144 |
static final String ADD_PREFIX = "add"; |
|
145 |
static final String REMOVE_PREFIX = "remove"; |
|
146 |
static final String GET_PREFIX = "get"; |
|
147 |
static final String SET_PREFIX = "set"; |
|
148 |
static final String IS_PREFIX = "is"; |
|
149 |
||
23581
0ca496340112
8038343: Eliminate use of reflection to access JavaBeans Introspector
alanb
parents:
23308
diff
changeset
|
150 |
// register with SharedSecrets for JMX usage |
0ca496340112
8038343: Eliminate use of reflection to access JavaBeans Introspector
alanb
parents:
23308
diff
changeset
|
151 |
static { |
30906
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
152 |
SharedSecrets.setJavaBeansAccess(new JavaBeansAccess() { |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
153 |
@Override |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
154 |
public Method getReadMethod(Class<?> clazz, String property) throws Exception { |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
155 |
BeanInfo bi = Introspector.getBeanInfo(clazz); |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
156 |
PropertyDescriptor[] pds = bi.getPropertyDescriptors(); |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
157 |
for (PropertyDescriptor pd: pds) { |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
158 |
if (pd.getName().equals(property)) { |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
159 |
return pd.getReadMethod(); |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
160 |
} |
23581
0ca496340112
8038343: Eliminate use of reflection to access JavaBeans Introspector
alanb
parents:
23308
diff
changeset
|
161 |
} |
30906
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
162 |
return null; |
23581
0ca496340112
8038343: Eliminate use of reflection to access JavaBeans Introspector
alanb
parents:
23308
diff
changeset
|
163 |
} |
30906
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
164 |
|
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
165 |
@Override |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
166 |
public String[] getConstructorPropertiesValue(Constructor<?> ctr) { |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
167 |
ConstructorProperties cp = ctr.getAnnotation(ConstructorProperties.class); |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
168 |
String [] ret = cp != null ? cp.value() : null; |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
169 |
return ret; |
1b67cbb0adce
8080663: Use sun.misc.SharedSecrets to allow access from java.management to @ConstructorProperties
jbachorik
parents:
25859
diff
changeset
|
170 |
} |
23581
0ca496340112
8038343: Eliminate use of reflection to access JavaBeans Introspector
alanb
parents:
23308
diff
changeset
|
171 |
}); |
0ca496340112
8038343: Eliminate use of reflection to access JavaBeans Introspector
alanb
parents:
23308
diff
changeset
|
172 |
} |
0ca496340112
8038343: Eliminate use of reflection to access JavaBeans Introspector
alanb
parents:
23308
diff
changeset
|
173 |
|
2 | 174 |
//====================================================================== |
175 |
// Public methods |
|
176 |
//====================================================================== |
|
177 |
||
178 |
/** |
|
179 |
* Introspect on a Java Bean and learn about all its properties, exposed |
|
180 |
* methods, and events. |
|
181 |
* <p> |
|
182 |
* If the BeanInfo class for a Java Bean has been previously Introspected |
|
183 |
* then the BeanInfo class is retrieved from the BeanInfo cache. |
|
184 |
* |
|
185 |
* @param beanClass The bean class to be analyzed. |
|
186 |
* @return A BeanInfo object describing the target bean. |
|
187 |
* @exception IntrospectionException if an exception occurs during |
|
188 |
* introspection. |
|
189 |
* @see #flushCaches |
|
190 |
* @see #flushFromCaches |
|
191 |
*/ |
|
192 |
public static BeanInfo getBeanInfo(Class<?> beanClass) |
|
193 |
throws IntrospectionException |
|
194 |
{ |
|
195 |
if (!ReflectUtil.isPackageAccessible(beanClass)) { |
|
196 |
return (new Introspector(beanClass, null, USE_ALL_BEANINFO)).getBeanInfo(); |
|
197 |
} |
|
11086
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
198 |
ThreadGroupContext context = ThreadGroupContext.getContext(); |
5959
3ff758c11233
6963811: Deadlock-prone locking changes in Introspector
malenkov
parents:
5947
diff
changeset
|
199 |
BeanInfo beanInfo; |
11086
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
200 |
synchronized (declaredMethodCache) { |
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
201 |
beanInfo = context.getBeanInfo(beanClass); |
5959
3ff758c11233
6963811: Deadlock-prone locking changes in Introspector
malenkov
parents:
5947
diff
changeset
|
202 |
} |
3ff758c11233
6963811: Deadlock-prone locking changes in Introspector
malenkov
parents:
5947
diff
changeset
|
203 |
if (beanInfo == null) { |
3ff758c11233
6963811: Deadlock-prone locking changes in Introspector
malenkov
parents:
5947
diff
changeset
|
204 |
beanInfo = new Introspector(beanClass, null, USE_ALL_BEANINFO).getBeanInfo(); |
11086
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
205 |
synchronized (declaredMethodCache) { |
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
206 |
context.putBeanInfo(beanClass, beanInfo); |
4382
c0759b1ccb56
5102804: Memory leak in Introspector.getBeanInfo(Class) for custom BeanInfo: Class param
malenkov
parents:
3476
diff
changeset
|
207 |
} |
3438
8bd2d2eeac83
6660539: Introspector shares cache of mutable BeanInfo between AppContexts.
malenkov
parents:
2
diff
changeset
|
208 |
} |
5959
3ff758c11233
6963811: Deadlock-prone locking changes in Introspector
malenkov
parents:
5947
diff
changeset
|
209 |
return beanInfo; |
2 | 210 |
} |
211 |
||
212 |
/** |
|
213 |
* Introspect on a Java bean and learn about all its properties, exposed |
|
214 |
* methods, and events, subject to some control flags. |
|
215 |
* <p> |
|
216 |
* If the BeanInfo class for a Java Bean has been previously Introspected |
|
217 |
* based on the same arguments then the BeanInfo class is retrieved |
|
218 |
* from the BeanInfo cache. |
|
219 |
* |
|
220 |
* @param beanClass The bean class to be analyzed. |
|
221 |
* @param flags Flags to control the introspection. |
|
222 |
* If flags == USE_ALL_BEANINFO then we use all of the BeanInfo |
|
223 |
* classes we can discover. |
|
224 |
* If flags == IGNORE_IMMEDIATE_BEANINFO then we ignore any |
|
225 |
* BeanInfo associated with the specified beanClass. |
|
226 |
* If flags == IGNORE_ALL_BEANINFO then we ignore all BeanInfo |
|
227 |
* associated with the specified beanClass or any of its |
|
228 |
* parent classes. |
|
229 |
* @return A BeanInfo object describing the target bean. |
|
230 |
* @exception IntrospectionException if an exception occurs during |
|
231 |
* introspection. |
|
25130
adfaa02ea516
8044855: Add missing @since tag under java.beans.*
henryjen
parents:
25123
diff
changeset
|
232 |
* @since 1.2 |
2 | 233 |
*/ |
234 |
public static BeanInfo getBeanInfo(Class<?> beanClass, int flags) |
|
235 |
throws IntrospectionException { |
|
236 |
return getBeanInfo(beanClass, null, flags); |
|
237 |
} |
|
238 |
||
239 |
/** |
|
240 |
* Introspect on a Java bean and learn all about its properties, exposed |
|
241 |
* methods, below a given "stop" point. |
|
242 |
* <p> |
|
243 |
* If the BeanInfo class for a Java Bean has been previously Introspected |
|
244 |
* based on the same arguments, then the BeanInfo class is retrieved |
|
245 |
* from the BeanInfo cache. |
|
19213 | 246 |
* @return the BeanInfo for the bean |
2 | 247 |
* @param beanClass The bean class to be analyzed. |
248 |
* @param stopClass The baseclass at which to stop the analysis. Any |
|
249 |
* methods/properties/events in the stopClass or in its baseclasses |
|
250 |
* will be ignored in the analysis. |
|
251 |
* @exception IntrospectionException if an exception occurs during |
|
252 |
* introspection. |
|
253 |
*/ |
|
254 |
public static BeanInfo getBeanInfo(Class<?> beanClass, Class<?> stopClass) |
|
255 |
throws IntrospectionException { |
|
256 |
return getBeanInfo(beanClass, stopClass, USE_ALL_BEANINFO); |
|
257 |
} |
|
258 |
||
259 |
/** |
|
260 |
* Introspect on a Java Bean and learn about all its properties, |
|
261 |
* exposed methods and events, below a given {@code stopClass} point |
|
262 |
* subject to some control {@code flags}. |
|
263 |
* <dl> |
|
264 |
* <dt>USE_ALL_BEANINFO</dt> |
|
265 |
* <dd>Any BeanInfo that can be discovered will be used.</dd> |
|
266 |
* <dt>IGNORE_IMMEDIATE_BEANINFO</dt> |
|
267 |
* <dd>Any BeanInfo associated with the specified {@code beanClass} will be ignored.</dd> |
|
268 |
* <dt>IGNORE_ALL_BEANINFO</dt> |
|
269 |
* <dd>Any BeanInfo associated with the specified {@code beanClass} |
|
270 |
* or any of its parent classes will be ignored.</dd> |
|
271 |
* </dl> |
|
272 |
* Any methods/properties/events in the {@code stopClass} |
|
273 |
* or in its parent classes will be ignored in the analysis. |
|
274 |
* <p> |
|
275 |
* If the BeanInfo class for a Java Bean has been |
|
276 |
* previously introspected based on the same arguments then |
|
277 |
* the BeanInfo class is retrieved from the BeanInfo cache. |
|
278 |
* |
|
279 |
* @param beanClass the bean class to be analyzed |
|
280 |
* @param stopClass the parent class at which to stop the analysis |
|
281 |
* @param flags flags to control the introspection |
|
282 |
* @return a BeanInfo object describing the target bean |
|
283 |
* @exception IntrospectionException if an exception occurs during introspection |
|
284 |
* |
|
285 |
* @since 1.7 |
|
286 |
*/ |
|
287 |
public static BeanInfo getBeanInfo(Class<?> beanClass, Class<?> stopClass, |
|
288 |
int flags) throws IntrospectionException { |
|
289 |
BeanInfo bi; |
|
290 |
if (stopClass == null && flags == USE_ALL_BEANINFO) { |
|
291 |
// Same parameters to take advantage of caching. |
|
292 |
bi = getBeanInfo(beanClass); |
|
293 |
} else { |
|
294 |
bi = (new Introspector(beanClass, stopClass, flags)).getBeanInfo(); |
|
295 |
} |
|
296 |
return bi; |
|
297 |
||
298 |
// Old behaviour: Make an independent copy of the BeanInfo. |
|
299 |
//return new GenericBeanInfo(bi); |
|
300 |
} |
|
301 |
||
302 |
||
303 |
/** |
|
304 |
* Utility method to take a string and convert it to normal Java variable |
|
305 |
* name capitalization. This normally means converting the first |
|
306 |
* character from upper case to lower case, but in the (unusual) special |
|
307 |
* case when there is more than one character and both the first and |
|
308 |
* second characters are upper case, we leave it alone. |
|
309 |
* <p> |
|
310 |
* Thus "FooBah" becomes "fooBah" and "X" becomes "x", but "URL" stays |
|
311 |
* as "URL". |
|
312 |
* |
|
313 |
* @param name The string to be decapitalized. |
|
314 |
* @return The decapitalized version of the string. |
|
315 |
*/ |
|
316 |
public static String decapitalize(String name) { |
|
317 |
if (name == null || name.length() == 0) { |
|
318 |
return name; |
|
319 |
} |
|
320 |
if (name.length() > 1 && Character.isUpperCase(name.charAt(1)) && |
|
321 |
Character.isUpperCase(name.charAt(0))){ |
|
322 |
return name; |
|
323 |
} |
|
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
324 |
char[] chars = name.toCharArray(); |
2 | 325 |
chars[0] = Character.toLowerCase(chars[0]); |
326 |
return new String(chars); |
|
327 |
} |
|
328 |
||
329 |
/** |
|
330 |
* Gets the list of package names that will be used for |
|
331 |
* finding BeanInfo classes. |
|
332 |
* |
|
333 |
* @return The array of package names that will be searched in |
|
334 |
* order to find BeanInfo classes. The default value |
|
335 |
* for this array is implementation-dependent; e.g. |
|
336 |
* Sun implementation initially sets to {"sun.beans.infos"}. |
|
337 |
*/ |
|
338 |
||
3239
f675984c2349
6380849: RFE: Automatic discovery of PersistanceDelegates
malenkov
parents:
2
diff
changeset
|
339 |
public static String[] getBeanInfoSearchPath() { |
11086
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
340 |
return ThreadGroupContext.getContext().getBeanInfoFinder().getPackages(); |
2 | 341 |
} |
342 |
||
343 |
/** |
|
344 |
* Change the list of package names that will be used for |
|
345 |
* finding BeanInfo classes. The behaviour of |
|
346 |
* this method is undefined if parameter path |
|
347 |
* is null. |
|
348 |
* |
|
35667 | 349 |
* <p>First, if there is a security manager, its {@code checkPropertiesAccess} |
2 | 350 |
* method is called. This could result in a SecurityException. |
351 |
* |
|
352 |
* @param path Array of package names. |
|
353 |
* @exception SecurityException if a security manager exists and its |
|
35667 | 354 |
* {@code checkPropertiesAccess} method doesn't allow setting |
2 | 355 |
* of system properties. |
356 |
* @see SecurityManager#checkPropertiesAccess |
|
357 |
*/ |
|
358 |
||
3239
f675984c2349
6380849: RFE: Automatic discovery of PersistanceDelegates
malenkov
parents:
2
diff
changeset
|
359 |
public static void setBeanInfoSearchPath(String[] path) { |
2 | 360 |
SecurityManager sm = System.getSecurityManager(); |
361 |
if (sm != null) { |
|
362 |
sm.checkPropertiesAccess(); |
|
363 |
} |
|
11086
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
364 |
ThreadGroupContext.getContext().getBeanInfoFinder().setPackages(path); |
2 | 365 |
} |
366 |
||
367 |
||
368 |
/** |
|
369 |
* Flush all of the Introspector's internal caches. This method is |
|
370 |
* not normally required. It is normally only needed by advanced |
|
371 |
* tools that update existing "Class" objects in-place and need |
|
372 |
* to make the Introspector re-analyze existing Class objects. |
|
25130
adfaa02ea516
8044855: Add missing @since tag under java.beans.*
henryjen
parents:
25123
diff
changeset
|
373 |
* |
adfaa02ea516
8044855: Add missing @since tag under java.beans.*
henryjen
parents:
25123
diff
changeset
|
374 |
* @since 1.2 |
2 | 375 |
*/ |
376 |
||
377 |
public static void flushCaches() { |
|
11086
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
378 |
synchronized (declaredMethodCache) { |
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
379 |
ThreadGroupContext.getContext().clearBeanInfoCache(); |
4382
c0759b1ccb56
5102804: Memory leak in Introspector.getBeanInfo(Class) for custom BeanInfo: Class param
malenkov
parents:
3476
diff
changeset
|
380 |
declaredMethodCache.clear(); |
3438
8bd2d2eeac83
6660539: Introspector shares cache of mutable BeanInfo between AppContexts.
malenkov
parents:
2
diff
changeset
|
381 |
} |
2 | 382 |
} |
383 |
||
384 |
/** |
|
385 |
* Flush the Introspector's internal cached information for a given class. |
|
386 |
* This method is not normally required. It is normally only needed |
|
387 |
* by advanced tools that update existing "Class" objects in-place |
|
388 |
* and need to make the Introspector re-analyze an existing Class object. |
|
389 |
* |
|
390 |
* Note that only the direct state associated with the target Class |
|
391 |
* object is flushed. We do not flush state for other Class objects |
|
392 |
* with the same name, nor do we flush state for any related Class |
|
393 |
* objects (such as subclasses), even though their state may include |
|
394 |
* information indirectly obtained from the target Class object. |
|
395 |
* |
|
396 |
* @param clz Class object to be flushed. |
|
397 |
* @throws NullPointerException If the Class object is null. |
|
25130
adfaa02ea516
8044855: Add missing @since tag under java.beans.*
henryjen
parents:
25123
diff
changeset
|
398 |
* @since 1.2 |
2 | 399 |
*/ |
400 |
public static void flushFromCaches(Class<?> clz) { |
|
401 |
if (clz == null) { |
|
402 |
throw new NullPointerException(); |
|
403 |
} |
|
11086
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
404 |
synchronized (declaredMethodCache) { |
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
405 |
ThreadGroupContext.getContext().removeBeanInfo(clz); |
4382
c0759b1ccb56
5102804: Memory leak in Introspector.getBeanInfo(Class) for custom BeanInfo: Class param
malenkov
parents:
3476
diff
changeset
|
406 |
declaredMethodCache.put(clz, null); |
3438
8bd2d2eeac83
6660539: Introspector shares cache of mutable BeanInfo between AppContexts.
malenkov
parents:
2
diff
changeset
|
407 |
} |
2 | 408 |
} |
409 |
||
410 |
//====================================================================== |
|
411 |
// Private implementation methods |
|
412 |
//====================================================================== |
|
413 |
||
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
414 |
private Introspector(Class<?> beanClass, Class<?> stopClass, int flags) |
2 | 415 |
throws IntrospectionException { |
416 |
this.beanClass = beanClass; |
|
417 |
||
418 |
// Check stopClass is a superClass of startClass. |
|
419 |
if (stopClass != null) { |
|
420 |
boolean isSuper = false; |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
421 |
for (Class<?> c = beanClass.getSuperclass(); c != null; c = c.getSuperclass()) { |
2 | 422 |
if (c == stopClass) { |
423 |
isSuper = true; |
|
424 |
} |
|
425 |
} |
|
426 |
if (!isSuper) { |
|
427 |
throw new IntrospectionException(stopClass.getName() + " not superclass of " + |
|
428 |
beanClass.getName()); |
|
429 |
} |
|
430 |
} |
|
431 |
||
432 |
if (flags == USE_ALL_BEANINFO) { |
|
433 |
explicitBeanInfo = findExplicitBeanInfo(beanClass); |
|
434 |
} |
|
435 |
||
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
436 |
Class<?> superClass = beanClass.getSuperclass(); |
2 | 437 |
if (superClass != stopClass) { |
438 |
int newFlags = flags; |
|
439 |
if (newFlags == IGNORE_IMMEDIATE_BEANINFO) { |
|
440 |
newFlags = USE_ALL_BEANINFO; |
|
441 |
} |
|
442 |
superBeanInfo = getBeanInfo(superClass, stopClass, newFlags); |
|
443 |
} |
|
444 |
if (explicitBeanInfo != null) { |
|
445 |
additionalBeanInfo = explicitBeanInfo.getAdditionalBeanInfo(); |
|
446 |
} |
|
447 |
if (additionalBeanInfo == null) { |
|
448 |
additionalBeanInfo = new BeanInfo[0]; |
|
449 |
} |
|
450 |
} |
|
451 |
||
452 |
/** |
|
453 |
* Constructs a GenericBeanInfo class from the state of the Introspector |
|
454 |
*/ |
|
455 |
private BeanInfo getBeanInfo() throws IntrospectionException { |
|
456 |
||
457 |
// the evaluation order here is import, as we evaluate the |
|
458 |
// event sets and locate PropertyChangeListeners before we |
|
459 |
// look for properties. |
|
460 |
BeanDescriptor bd = getTargetBeanDescriptor(); |
|
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
461 |
MethodDescriptor[] mds = getTargetMethodInfo(); |
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
462 |
EventSetDescriptor[] esds = getTargetEventInfo(); |
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
463 |
PropertyDescriptor[] pds = getTargetPropertyInfo(); |
2 | 464 |
|
465 |
int defaultEvent = getTargetDefaultEventIndex(); |
|
466 |
int defaultProperty = getTargetDefaultPropertyIndex(); |
|
467 |
||
468 |
return new GenericBeanInfo(bd, esds, defaultEvent, pds, |
|
469 |
defaultProperty, mds, explicitBeanInfo); |
|
470 |
||
471 |
} |
|
472 |
||
473 |
/** |
|
474 |
* Looks for an explicit BeanInfo class that corresponds to the Class. |
|
475 |
* First it looks in the existing package that the Class is defined in, |
|
476 |
* then it checks to see if the class is its own BeanInfo. Finally, |
|
477 |
* the BeanInfo search path is prepended to the class and searched. |
|
478 |
* |
|
3239
f675984c2349
6380849: RFE: Automatic discovery of PersistanceDelegates
malenkov
parents:
2
diff
changeset
|
479 |
* @param beanClass the class type of the bean |
2 | 480 |
* @return Instance of an explicit BeanInfo class or null if one isn't found. |
481 |
*/ |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
482 |
private static BeanInfo findExplicitBeanInfo(Class<?> beanClass) { |
11086
09b1d6383d0b
7064279: Introspector.getBeanInfo() should release some resources in timely manner
malenkov
parents:
9035
diff
changeset
|
483 |
return ThreadGroupContext.getContext().getBeanInfoFinder().find(beanClass); |
2 | 484 |
} |
485 |
||
486 |
/** |
|
487 |
* @return An array of PropertyDescriptors describing the editable |
|
488 |
* properties supported by the target bean. |
|
489 |
*/ |
|
490 |
||
491 |
private PropertyDescriptor[] getTargetPropertyInfo() { |
|
492 |
||
493 |
// Check if the bean has its own BeanInfo that will provide |
|
494 |
// explicit information. |
|
495 |
PropertyDescriptor[] explicitProperties = null; |
|
496 |
if (explicitBeanInfo != null) { |
|
497 |
explicitProperties = getPropertyDescriptors(this.explicitBeanInfo); |
|
498 |
} |
|
499 |
||
500 |
if (explicitProperties == null && superBeanInfo != null) { |
|
501 |
// We have no explicit BeanInfo properties. Check with our parent. |
|
502 |
addPropertyDescriptors(getPropertyDescriptors(this.superBeanInfo)); |
|
503 |
} |
|
504 |
||
505 |
for (int i = 0; i < additionalBeanInfo.length; i++) { |
|
506 |
addPropertyDescriptors(additionalBeanInfo[i].getPropertyDescriptors()); |
|
507 |
} |
|
508 |
||
509 |
if (explicitProperties != null) { |
|
510 |
// Add the explicit BeanInfo data to our results. |
|
511 |
addPropertyDescriptors(explicitProperties); |
|
512 |
||
513 |
} else { |
|
514 |
// Apply some reflection to the current class. |
|
25566
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
515 |
for (Map.Entry<String,PropertyInfo> entry : ClassInfo.get(this.beanClass).getProperties().entrySet()) { |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
516 |
addPropertyDescriptor(null != entry.getValue().getIndexed() |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
517 |
? new IndexedPropertyDescriptor(entry, this.propertyChangeSource) |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
518 |
: new PropertyDescriptor(entry, this.propertyChangeSource)); |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
519 |
} |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
520 |
JavaBean annotation = this.beanClass.getAnnotation(JavaBean.class); |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
521 |
if ((annotation != null) && !annotation.defaultProperty().isEmpty()) { |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
522 |
this.defaultPropertyName = annotation.defaultProperty(); |
2 | 523 |
} |
524 |
} |
|
525 |
processPropertyDescriptors(); |
|
526 |
||
527 |
// Allocate and populate the result array. |
|
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
528 |
PropertyDescriptor[] result = |
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
529 |
properties.values().toArray(new PropertyDescriptor[properties.size()]); |
2 | 530 |
|
531 |
// Set the default index. |
|
532 |
if (defaultPropertyName != null) { |
|
533 |
for (int i = 0; i < result.length; i++) { |
|
534 |
if (defaultPropertyName.equals(result[i].getName())) { |
|
535 |
defaultPropertyIndex = i; |
|
536 |
} |
|
537 |
} |
|
538 |
} |
|
539 |
return result; |
|
540 |
} |
|
541 |
||
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
542 |
private HashMap<String, List<PropertyDescriptor>> pdStore = new HashMap<>(); |
2 | 543 |
|
544 |
/** |
|
545 |
* Adds the property descriptor to the list store. |
|
546 |
*/ |
|
547 |
private void addPropertyDescriptor(PropertyDescriptor pd) { |
|
548 |
String propName = pd.getName(); |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
549 |
List<PropertyDescriptor> list = pdStore.get(propName); |
2 | 550 |
if (list == null) { |
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
551 |
list = new ArrayList<>(); |
2 | 552 |
pdStore.put(propName, list); |
553 |
} |
|
554 |
if (this.beanClass != pd.getClass0()) { |
|
555 |
// replace existing property descriptor |
|
556 |
// only if we have types to resolve |
|
557 |
// in the context of this.beanClass |
|
13773
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
558 |
Method read = pd.getReadMethod(); |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
559 |
Method write = pd.getWriteMethod(); |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
560 |
boolean cls = true; |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
561 |
if (read != null) cls = cls && read.getGenericReturnType() instanceof Class; |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
562 |
if (write != null) cls = cls && write.getGenericParameterTypes()[0] instanceof Class; |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
563 |
if (pd instanceof IndexedPropertyDescriptor) { |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
564 |
IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd; |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
565 |
Method readI = ipd.getIndexedReadMethod(); |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
566 |
Method writeI = ipd.getIndexedWriteMethod(); |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
567 |
if (readI != null) cls = cls && readI.getGenericReturnType() instanceof Class; |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
568 |
if (writeI != null) cls = cls && writeI.getGenericParameterTypes()[1] instanceof Class; |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
569 |
if (!cls) { |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
570 |
pd = new IndexedPropertyDescriptor(ipd); |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
571 |
pd.updateGenericsFor(this.beanClass); |
2 | 572 |
} |
13773
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
573 |
} |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
574 |
else if (!cls) { |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
575 |
pd = new PropertyDescriptor(pd); |
69665c88db93
7193977: REGRESSION:Java 7's JavaBeans persistence ignoring the "transient" flag on properties
malenkov
parents:
13654
diff
changeset
|
576 |
pd.updateGenericsFor(this.beanClass); |
2 | 577 |
} |
578 |
} |
|
579 |
list.add(pd); |
|
580 |
} |
|
581 |
||
582 |
private void addPropertyDescriptors(PropertyDescriptor[] descriptors) { |
|
583 |
if (descriptors != null) { |
|
584 |
for (PropertyDescriptor descriptor : descriptors) { |
|
585 |
addPropertyDescriptor(descriptor); |
|
586 |
} |
|
587 |
} |
|
588 |
} |
|
589 |
||
590 |
private PropertyDescriptor[] getPropertyDescriptors(BeanInfo info) { |
|
591 |
PropertyDescriptor[] descriptors = info.getPropertyDescriptors(); |
|
592 |
int index = info.getDefaultPropertyIndex(); |
|
593 |
if ((0 <= index) && (index < descriptors.length)) { |
|
594 |
this.defaultPropertyName = descriptors[index].getName(); |
|
595 |
} |
|
596 |
return descriptors; |
|
597 |
} |
|
598 |
||
599 |
/** |
|
600 |
* Populates the property descriptor table by merging the |
|
601 |
* lists of Property descriptors. |
|
602 |
*/ |
|
603 |
private void processPropertyDescriptors() { |
|
604 |
if (properties == null) { |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
605 |
properties = new TreeMap<>(); |
2 | 606 |
} |
607 |
||
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
608 |
List<PropertyDescriptor> list; |
2 | 609 |
|
610 |
PropertyDescriptor pd, gpd, spd; |
|
611 |
IndexedPropertyDescriptor ipd, igpd, ispd; |
|
612 |
||
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
613 |
Iterator<List<PropertyDescriptor>> it = pdStore.values().iterator(); |
2 | 614 |
while (it.hasNext()) { |
615 |
pd = null; gpd = null; spd = null; |
|
616 |
ipd = null; igpd = null; ispd = null; |
|
617 |
||
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
618 |
list = it.next(); |
2 | 619 |
|
620 |
// First pass. Find the latest getter method. Merge properties |
|
621 |
// of previous getter methods. |
|
622 |
for (int i = 0; i < list.size(); i++) { |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
623 |
pd = list.get(i); |
2 | 624 |
if (pd instanceof IndexedPropertyDescriptor) { |
625 |
ipd = (IndexedPropertyDescriptor)pd; |
|
626 |
if (ipd.getIndexedReadMethod() != null) { |
|
627 |
if (igpd != null) { |
|
628 |
igpd = new IndexedPropertyDescriptor(igpd, ipd); |
|
629 |
} else { |
|
630 |
igpd = ipd; |
|
631 |
} |
|
632 |
} |
|
633 |
} else { |
|
634 |
if (pd.getReadMethod() != null) { |
|
18757
5ab9e48648e5
6707231: Wrong read Method returned for boolen properties
malenkov
parents:
16837
diff
changeset
|
635 |
String pdName = pd.getReadMethod().getName(); |
2 | 636 |
if (gpd != null) { |
637 |
// Don't replace the existing read |
|
638 |
// method if it starts with "is" |
|
18757
5ab9e48648e5
6707231: Wrong read Method returned for boolen properties
malenkov
parents:
16837
diff
changeset
|
639 |
String gpdName = gpd.getReadMethod().getName(); |
5ab9e48648e5
6707231: Wrong read Method returned for boolen properties
malenkov
parents:
16837
diff
changeset
|
640 |
if (gpdName.equals(pdName) || !gpdName.startsWith(IS_PREFIX)) { |
2 | 641 |
gpd = new PropertyDescriptor(gpd, pd); |
642 |
} |
|
643 |
} else { |
|
644 |
gpd = pd; |
|
645 |
} |
|
646 |
} |
|
647 |
} |
|
648 |
} |
|
649 |
||
650 |
// Second pass. Find the latest setter method which |
|
651 |
// has the same type as the getter method. |
|
652 |
for (int i = 0; i < list.size(); i++) { |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
653 |
pd = list.get(i); |
2 | 654 |
if (pd instanceof IndexedPropertyDescriptor) { |
655 |
ipd = (IndexedPropertyDescriptor)pd; |
|
656 |
if (ipd.getIndexedWriteMethod() != null) { |
|
657 |
if (igpd != null) { |
|
21593
4284575a978e
8027648: Type of overridden property is resolved incorrectly
malenkov
parents:
20455
diff
changeset
|
658 |
if (isAssignable(igpd.getIndexedPropertyType(), ipd.getIndexedPropertyType())) { |
2 | 659 |
if (ispd != null) { |
660 |
ispd = new IndexedPropertyDescriptor(ispd, ipd); |
|
661 |
} else { |
|
662 |
ispd = ipd; |
|
663 |
} |
|
664 |
} |
|
665 |
} else { |
|
666 |
if (ispd != null) { |
|
667 |
ispd = new IndexedPropertyDescriptor(ispd, ipd); |
|
668 |
} else { |
|
669 |
ispd = ipd; |
|
670 |
} |
|
671 |
} |
|
672 |
} |
|
673 |
} else { |
|
674 |
if (pd.getWriteMethod() != null) { |
|
675 |
if (gpd != null) { |
|
21593
4284575a978e
8027648: Type of overridden property is resolved incorrectly
malenkov
parents:
20455
diff
changeset
|
676 |
if (isAssignable(gpd.getPropertyType(), pd.getPropertyType())) { |
2 | 677 |
if (spd != null) { |
678 |
spd = new PropertyDescriptor(spd, pd); |
|
679 |
} else { |
|
680 |
spd = pd; |
|
681 |
} |
|
682 |
} |
|
683 |
} else { |
|
684 |
if (spd != null) { |
|
685 |
spd = new PropertyDescriptor(spd, pd); |
|
686 |
} else { |
|
687 |
spd = pd; |
|
688 |
} |
|
689 |
} |
|
690 |
} |
|
691 |
} |
|
692 |
} |
|
693 |
||
694 |
// At this stage we should have either PDs or IPDs for the |
|
695 |
// representative getters and setters. The order at which the |
|
696 |
// property descriptors are determined represent the |
|
697 |
// precedence of the property ordering. |
|
698 |
pd = null; ipd = null; |
|
699 |
||
700 |
if (igpd != null && ispd != null) { |
|
701 |
// Complete indexed properties set |
|
702 |
// Merge any classic property descriptors |
|
23308 | 703 |
if ((gpd == spd) || (gpd == null)) { |
704 |
pd = spd; |
|
705 |
} else if (spd == null) { |
|
706 |
pd = gpd; |
|
707 |
} else if (spd instanceof IndexedPropertyDescriptor) { |
|
708 |
pd = mergePropertyWithIndexedProperty(gpd, (IndexedPropertyDescriptor) spd); |
|
709 |
} else if (gpd instanceof IndexedPropertyDescriptor) { |
|
710 |
pd = mergePropertyWithIndexedProperty(spd, (IndexedPropertyDescriptor) gpd); |
|
711 |
} else { |
|
712 |
pd = mergePropertyDescriptor(gpd, spd); |
|
2 | 713 |
} |
714 |
if (igpd == ispd) { |
|
23308 | 715 |
ipd = igpd; |
716 |
} else { |
|
717 |
ipd = mergePropertyDescriptor(igpd, ispd); |
|
718 |
} |
|
719 |
if (pd == null) { |
|
720 |
pd = ipd; |
|
2 | 721 |
} else { |
23308 | 722 |
Class<?> propType = pd.getPropertyType(); |
723 |
Class<?> ipropType = ipd.getIndexedPropertyType(); |
|
724 |
if (propType.isArray() && propType.getComponentType() == ipropType) { |
|
725 |
pd = pd.getClass0().isAssignableFrom(ipd.getClass0()) |
|
726 |
? new IndexedPropertyDescriptor(pd, ipd) |
|
727 |
: new IndexedPropertyDescriptor(ipd, pd); |
|
728 |
} else if (pd.getClass0().isAssignableFrom(ipd.getClass0())) { |
|
729 |
pd = pd.getClass0().isAssignableFrom(ipd.getClass0()) |
|
730 |
? new PropertyDescriptor(pd, ipd) |
|
731 |
: new PropertyDescriptor(ipd, pd); |
|
732 |
} else { |
|
733 |
pd = ipd; |
|
734 |
} |
|
2 | 735 |
} |
736 |
} else if (gpd != null && spd != null) { |
|
23296
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
737 |
if (igpd != null) { |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
738 |
gpd = mergePropertyWithIndexedProperty(gpd, igpd); |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
739 |
} |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
740 |
if (ispd != null) { |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
741 |
spd = mergePropertyWithIndexedProperty(spd, ispd); |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
742 |
} |
2 | 743 |
// Complete simple properties set |
744 |
if (gpd == spd) { |
|
745 |
pd = gpd; |
|
23296
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
746 |
} else if (spd instanceof IndexedPropertyDescriptor) { |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
747 |
pd = mergePropertyWithIndexedProperty(gpd, (IndexedPropertyDescriptor) spd); |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
748 |
} else if (gpd instanceof IndexedPropertyDescriptor) { |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
749 |
pd = mergePropertyWithIndexedProperty(spd, (IndexedPropertyDescriptor) gpd); |
2 | 750 |
} else { |
751 |
pd = mergePropertyDescriptor(gpd, spd); |
|
752 |
} |
|
753 |
} else if (ispd != null) { |
|
754 |
// indexed setter |
|
755 |
pd = ispd; |
|
756 |
// Merge any classic property descriptors |
|
757 |
if (spd != null) { |
|
758 |
pd = mergePropertyDescriptor(ispd, spd); |
|
759 |
} |
|
760 |
if (gpd != null) { |
|
761 |
pd = mergePropertyDescriptor(ispd, gpd); |
|
762 |
} |
|
763 |
} else if (igpd != null) { |
|
764 |
// indexed getter |
|
765 |
pd = igpd; |
|
766 |
// Merge any classic property descriptors |
|
767 |
if (gpd != null) { |
|
768 |
pd = mergePropertyDescriptor(igpd, gpd); |
|
769 |
} |
|
770 |
if (spd != null) { |
|
771 |
pd = mergePropertyDescriptor(igpd, spd); |
|
772 |
} |
|
773 |
} else if (spd != null) { |
|
774 |
// simple setter |
|
775 |
pd = spd; |
|
776 |
} else if (gpd != null) { |
|
777 |
// simple getter |
|
778 |
pd = gpd; |
|
779 |
} |
|
780 |
||
781 |
// Very special case to ensure that an IndexedPropertyDescriptor |
|
782 |
// doesn't contain less information than the enclosed |
|
783 |
// PropertyDescriptor. If it does, then recreate as a |
|
784 |
// PropertyDescriptor. See 4168833 |
|
785 |
if (pd instanceof IndexedPropertyDescriptor) { |
|
786 |
ipd = (IndexedPropertyDescriptor)pd; |
|
787 |
if (ipd.getIndexedReadMethod() == null && ipd.getIndexedWriteMethod() == null) { |
|
788 |
pd = new PropertyDescriptor(ipd); |
|
789 |
} |
|
790 |
} |
|
791 |
||
792 |
// Find the first property descriptor |
|
793 |
// which does not have getter and setter methods. |
|
794 |
// See regression bug 4984912. |
|
795 |
if ( (pd == null) && (list.size() > 0) ) { |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
796 |
pd = list.get(0); |
2 | 797 |
} |
798 |
||
799 |
if (pd != null) { |
|
800 |
properties.put(pd.getName(), pd); |
|
801 |
} |
|
802 |
} |
|
803 |
} |
|
804 |
||
21593
4284575a978e
8027648: Type of overridden property is resolved incorrectly
malenkov
parents:
20455
diff
changeset
|
805 |
private static boolean isAssignable(Class<?> current, Class<?> candidate) { |
24177
cbbea768ae65
8039776: Introspector throws NullPointerException for subclasses' mismatched get/setter
malenkov
parents:
23581
diff
changeset
|
806 |
return ((current == null) || (candidate == null)) ? current == candidate : current.isAssignableFrom(candidate); |
21593
4284575a978e
8027648: Type of overridden property is resolved incorrectly
malenkov
parents:
20455
diff
changeset
|
807 |
} |
4284575a978e
8027648: Type of overridden property is resolved incorrectly
malenkov
parents:
20455
diff
changeset
|
808 |
|
23296
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
809 |
private PropertyDescriptor mergePropertyWithIndexedProperty(PropertyDescriptor pd, IndexedPropertyDescriptor ipd) { |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
810 |
Class<?> type = pd.getPropertyType(); |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
811 |
if (type.isArray() && (type.getComponentType() == ipd.getIndexedPropertyType())) { |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
812 |
return pd.getClass0().isAssignableFrom(ipd.getClass0()) |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
813 |
? new IndexedPropertyDescriptor(pd, ipd) |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
814 |
: new IndexedPropertyDescriptor(ipd, pd); |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
815 |
} |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
816 |
return pd; |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
817 |
} |
0acf698eee6a
8034164: Introspector ignores indexed part of the property sometimes
malenkov
parents:
21593
diff
changeset
|
818 |
|
2 | 819 |
/** |
820 |
* Adds the property descriptor to the indexedproperty descriptor only if the |
|
821 |
* types are the same. |
|
822 |
* |
|
823 |
* The most specific property descriptor will take precedence. |
|
824 |
*/ |
|
825 |
private PropertyDescriptor mergePropertyDescriptor(IndexedPropertyDescriptor ipd, |
|
826 |
PropertyDescriptor pd) { |
|
827 |
PropertyDescriptor result = null; |
|
828 |
||
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
829 |
Class<?> propType = pd.getPropertyType(); |
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
830 |
Class<?> ipropType = ipd.getIndexedPropertyType(); |
2 | 831 |
|
832 |
if (propType.isArray() && propType.getComponentType() == ipropType) { |
|
833 |
if (pd.getClass0().isAssignableFrom(ipd.getClass0())) { |
|
834 |
result = new IndexedPropertyDescriptor(pd, ipd); |
|
835 |
} else { |
|
836 |
result = new IndexedPropertyDescriptor(ipd, pd); |
|
837 |
} |
|
23308 | 838 |
} else if ((ipd.getReadMethod() == null) && (ipd.getWriteMethod() == null)) { |
839 |
if (pd.getClass0().isAssignableFrom(ipd.getClass0())) { |
|
840 |
result = new PropertyDescriptor(pd, ipd); |
|
841 |
} else { |
|
842 |
result = new PropertyDescriptor(ipd, pd); |
|
843 |
} |
|
2 | 844 |
} else { |
845 |
// Cannot merge the pd because of type mismatch |
|
846 |
// Return the most specific pd |
|
847 |
if (pd.getClass0().isAssignableFrom(ipd.getClass0())) { |
|
848 |
result = ipd; |
|
849 |
} else { |
|
850 |
result = pd; |
|
851 |
// Try to add methods which may have been lost in the type change |
|
852 |
// See 4168833 |
|
853 |
Method write = result.getWriteMethod(); |
|
854 |
Method read = result.getReadMethod(); |
|
855 |
||
856 |
if (read == null && write != null) { |
|
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
857 |
read = findMethod(result.getClass0(), |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
858 |
GET_PREFIX + NameGenerator.capitalize(result.getName()), 0); |
2 | 859 |
if (read != null) { |
860 |
try { |
|
861 |
result.setReadMethod(read); |
|
862 |
} catch (IntrospectionException ex) { |
|
863 |
// no consequences for failure. |
|
864 |
} |
|
865 |
} |
|
866 |
} |
|
867 |
if (write == null && read != null) { |
|
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
868 |
write = findMethod(result.getClass0(), |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
869 |
SET_PREFIX + NameGenerator.capitalize(result.getName()), 1, |
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
870 |
new Class<?>[] { FeatureDescriptor.getReturnType(result.getClass0(), read) }); |
2 | 871 |
if (write != null) { |
872 |
try { |
|
873 |
result.setWriteMethod(write); |
|
874 |
} catch (IntrospectionException ex) { |
|
875 |
// no consequences for failure. |
|
876 |
} |
|
877 |
} |
|
878 |
} |
|
879 |
} |
|
880 |
} |
|
881 |
return result; |
|
882 |
} |
|
883 |
||
884 |
// Handle regular pd merge |
|
885 |
private PropertyDescriptor mergePropertyDescriptor(PropertyDescriptor pd1, |
|
886 |
PropertyDescriptor pd2) { |
|
887 |
if (pd1.getClass0().isAssignableFrom(pd2.getClass0())) { |
|
888 |
return new PropertyDescriptor(pd1, pd2); |
|
889 |
} else { |
|
890 |
return new PropertyDescriptor(pd2, pd1); |
|
891 |
} |
|
892 |
} |
|
893 |
||
894 |
// Handle regular ipd merge |
|
23308 | 895 |
private IndexedPropertyDescriptor mergePropertyDescriptor(IndexedPropertyDescriptor ipd1, |
2 | 896 |
IndexedPropertyDescriptor ipd2) { |
897 |
if (ipd1.getClass0().isAssignableFrom(ipd2.getClass0())) { |
|
898 |
return new IndexedPropertyDescriptor(ipd1, ipd2); |
|
899 |
} else { |
|
900 |
return new IndexedPropertyDescriptor(ipd2, ipd1); |
|
901 |
} |
|
902 |
} |
|
903 |
||
904 |
/** |
|
905 |
* @return An array of EventSetDescriptors describing the kinds of |
|
906 |
* events fired by the target bean. |
|
907 |
*/ |
|
908 |
private EventSetDescriptor[] getTargetEventInfo() throws IntrospectionException { |
|
909 |
if (events == null) { |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
910 |
events = new HashMap<>(); |
2 | 911 |
} |
912 |
||
913 |
// Check if the bean has its own BeanInfo that will provide |
|
914 |
// explicit information. |
|
915 |
EventSetDescriptor[] explicitEvents = null; |
|
916 |
if (explicitBeanInfo != null) { |
|
917 |
explicitEvents = explicitBeanInfo.getEventSetDescriptors(); |
|
918 |
int ix = explicitBeanInfo.getDefaultEventIndex(); |
|
919 |
if (ix >= 0 && ix < explicitEvents.length) { |
|
920 |
defaultEventName = explicitEvents[ix].getName(); |
|
921 |
} |
|
922 |
} |
|
923 |
||
924 |
if (explicitEvents == null && superBeanInfo != null) { |
|
925 |
// We have no explicit BeanInfo events. Check with our parent. |
|
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
926 |
EventSetDescriptor[] supers = superBeanInfo.getEventSetDescriptors(); |
2 | 927 |
for (int i = 0 ; i < supers.length; i++) { |
928 |
addEvent(supers[i]); |
|
929 |
} |
|
930 |
int ix = superBeanInfo.getDefaultEventIndex(); |
|
931 |
if (ix >= 0 && ix < supers.length) { |
|
932 |
defaultEventName = supers[ix].getName(); |
|
933 |
} |
|
934 |
} |
|
935 |
||
936 |
for (int i = 0; i < additionalBeanInfo.length; i++) { |
|
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
937 |
EventSetDescriptor[] additional = additionalBeanInfo[i].getEventSetDescriptors(); |
2 | 938 |
if (additional != null) { |
939 |
for (int j = 0 ; j < additional.length; j++) { |
|
940 |
addEvent(additional[j]); |
|
941 |
} |
|
942 |
} |
|
943 |
} |
|
944 |
||
945 |
if (explicitEvents != null) { |
|
946 |
// Add the explicit explicitBeanInfo data to our results. |
|
947 |
for (int i = 0 ; i < explicitEvents.length; i++) { |
|
948 |
addEvent(explicitEvents[i]); |
|
949 |
} |
|
950 |
||
951 |
} else { |
|
952 |
// Apply some reflection to the current class. |
|
25566
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
953 |
for (Map.Entry<String,EventSetInfo> entry : ClassInfo.get(this.beanClass).getEventSets().entrySet()) { |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
954 |
// generate a list of Method objects for each of the target methods: |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
955 |
List<Method> methods = new ArrayList<>(); |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
956 |
for (Method method : ClassInfo.get(entry.getValue().getListenerType()).getMethods()) { |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
957 |
if (isEventHandler(method)) { |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
958 |
methods.add(method); |
2 | 959 |
} |
960 |
} |
|
25566
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
961 |
addEvent(new EventSetDescriptor( |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
962 |
entry.getKey(), |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
963 |
entry.getValue(), |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
964 |
methods.toArray(new Method[methods.size()]))); |
2 | 965 |
} |
25566
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
966 |
JavaBean annotation = this.beanClass.getAnnotation(JavaBean.class); |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
967 |
if ((annotation != null) && !annotation.defaultEventSet().isEmpty()) { |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
968 |
this.defaultEventName = annotation.defaultEventSet(); |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
969 |
} |
2 | 970 |
} |
971 |
EventSetDescriptor[] result; |
|
972 |
if (events.size() == 0) { |
|
973 |
result = EMPTY_EVENTSETDESCRIPTORS; |
|
974 |
} else { |
|
975 |
// Allocate and populate the result array. |
|
976 |
result = new EventSetDescriptor[events.size()]; |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
977 |
result = events.values().toArray(result); |
2 | 978 |
// Set the default index. |
979 |
if (defaultEventName != null) { |
|
980 |
for (int i = 0; i < result.length; i++) { |
|
981 |
if (defaultEventName.equals(result[i].getName())) { |
|
982 |
defaultEventIndex = i; |
|
983 |
} |
|
984 |
} |
|
985 |
} |
|
986 |
} |
|
987 |
return result; |
|
988 |
} |
|
989 |
||
990 |
private void addEvent(EventSetDescriptor esd) { |
|
991 |
String key = esd.getName(); |
|
992 |
if (esd.getName().equals("propertyChange")) { |
|
993 |
propertyChangeSource = true; |
|
994 |
} |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
995 |
EventSetDescriptor old = events.get(key); |
2 | 996 |
if (old == null) { |
997 |
events.put(key, esd); |
|
998 |
return; |
|
999 |
} |
|
1000 |
EventSetDescriptor composite = new EventSetDescriptor(old, esd); |
|
1001 |
events.put(key, composite); |
|
1002 |
} |
|
1003 |
||
1004 |
/** |
|
1005 |
* @return An array of MethodDescriptors describing the private |
|
1006 |
* methods supported by the target bean. |
|
1007 |
*/ |
|
1008 |
private MethodDescriptor[] getTargetMethodInfo() { |
|
1009 |
if (methods == null) { |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1010 |
methods = new HashMap<>(100); |
2 | 1011 |
} |
1012 |
||
1013 |
// Check if the bean has its own BeanInfo that will provide |
|
1014 |
// explicit information. |
|
1015 |
MethodDescriptor[] explicitMethods = null; |
|
1016 |
if (explicitBeanInfo != null) { |
|
1017 |
explicitMethods = explicitBeanInfo.getMethodDescriptors(); |
|
1018 |
} |
|
1019 |
||
1020 |
if (explicitMethods == null && superBeanInfo != null) { |
|
1021 |
// We have no explicit BeanInfo methods. Check with our parent. |
|
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
1022 |
MethodDescriptor[] supers = superBeanInfo.getMethodDescriptors(); |
2 | 1023 |
for (int i = 0 ; i < supers.length; i++) { |
1024 |
addMethod(supers[i]); |
|
1025 |
} |
|
1026 |
} |
|
1027 |
||
1028 |
for (int i = 0; i < additionalBeanInfo.length; i++) { |
|
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
1029 |
MethodDescriptor[] additional = additionalBeanInfo[i].getMethodDescriptors(); |
2 | 1030 |
if (additional != null) { |
1031 |
for (int j = 0 ; j < additional.length; j++) { |
|
1032 |
addMethod(additional[j]); |
|
1033 |
} |
|
1034 |
} |
|
1035 |
} |
|
1036 |
||
1037 |
if (explicitMethods != null) { |
|
1038 |
// Add the explicit explicitBeanInfo data to our results. |
|
1039 |
for (int i = 0 ; i < explicitMethods.length; i++) { |
|
1040 |
addMethod(explicitMethods[i]); |
|
1041 |
} |
|
1042 |
||
1043 |
} else { |
|
1044 |
// Apply some reflection to the current class. |
|
25566
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
1045 |
for (Method method : ClassInfo.get(this.beanClass).getMethods()) { |
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
1046 |
addMethod(new MethodDescriptor(method)); |
2 | 1047 |
} |
1048 |
} |
|
1049 |
||
1050 |
// Allocate and populate the result array. |
|
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
1051 |
MethodDescriptor[] result = new MethodDescriptor[methods.size()]; |
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1052 |
result = methods.values().toArray(result); |
2 | 1053 |
|
1054 |
return result; |
|
1055 |
} |
|
1056 |
||
1057 |
private void addMethod(MethodDescriptor md) { |
|
1058 |
// We have to be careful here to distinguish method by both name |
|
1059 |
// and argument lists. |
|
1060 |
// This method gets called a *lot, so we try to be efficient. |
|
1061 |
String name = md.getName(); |
|
1062 |
||
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1063 |
MethodDescriptor old = methods.get(name); |
2 | 1064 |
if (old == null) { |
1065 |
// This is the common case. |
|
1066 |
methods.put(name, md); |
|
1067 |
return; |
|
1068 |
} |
|
1069 |
||
1070 |
// We have a collision on method names. This is rare. |
|
1071 |
||
1072 |
// Check if old and md have the same type. |
|
1073 |
String[] p1 = md.getParamNames(); |
|
1074 |
String[] p2 = old.getParamNames(); |
|
1075 |
||
1076 |
boolean match = false; |
|
1077 |
if (p1.length == p2.length) { |
|
1078 |
match = true; |
|
1079 |
for (int i = 0; i < p1.length; i++) { |
|
1080 |
if (p1[i] != p2[i]) { |
|
1081 |
match = false; |
|
1082 |
break; |
|
1083 |
} |
|
1084 |
} |
|
1085 |
} |
|
1086 |
if (match) { |
|
1087 |
MethodDescriptor composite = new MethodDescriptor(old, md); |
|
1088 |
methods.put(name, composite); |
|
1089 |
return; |
|
1090 |
} |
|
1091 |
||
1092 |
// We have a collision on method names with different type signatures. |
|
1093 |
// This is very rare. |
|
1094 |
||
1095 |
String longKey = makeQualifiedMethodName(name, p1); |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1096 |
old = methods.get(longKey); |
2 | 1097 |
if (old == null) { |
1098 |
methods.put(longKey, md); |
|
1099 |
return; |
|
1100 |
} |
|
1101 |
MethodDescriptor composite = new MethodDescriptor(old, md); |
|
1102 |
methods.put(longKey, composite); |
|
1103 |
} |
|
1104 |
||
1105 |
/** |
|
1106 |
* Creates a key for a method in a method cache. |
|
1107 |
*/ |
|
1108 |
private static String makeQualifiedMethodName(String name, String[] params) { |
|
24969
afa6934dd8e8
8041679: Replace uses of StringBuffer with StringBuilder within core library classes
psandoz
parents:
24177
diff
changeset
|
1109 |
StringBuilder sb = new StringBuilder(name); |
2 | 1110 |
sb.append('='); |
1111 |
for (int i = 0; i < params.length; i++) { |
|
1112 |
sb.append(':'); |
|
1113 |
sb.append(params[i]); |
|
1114 |
} |
|
1115 |
return sb.toString(); |
|
1116 |
} |
|
1117 |
||
1118 |
private int getTargetDefaultEventIndex() { |
|
1119 |
return defaultEventIndex; |
|
1120 |
} |
|
1121 |
||
1122 |
private int getTargetDefaultPropertyIndex() { |
|
1123 |
return defaultPropertyIndex; |
|
1124 |
} |
|
1125 |
||
1126 |
private BeanDescriptor getTargetBeanDescriptor() { |
|
1127 |
// Use explicit info, if available, |
|
1128 |
if (explicitBeanInfo != null) { |
|
1129 |
BeanDescriptor bd = explicitBeanInfo.getBeanDescriptor(); |
|
1130 |
if (bd != null) { |
|
1131 |
return (bd); |
|
1132 |
} |
|
1133 |
} |
|
1134 |
// OK, fabricate a default BeanDescriptor. |
|
7249
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1135 |
return new BeanDescriptor(this.beanClass, findCustomizerClass(this.beanClass)); |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1136 |
} |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1137 |
|
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1138 |
private static Class<?> findCustomizerClass(Class<?> type) { |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1139 |
String name = type.getName() + "Customizer"; |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1140 |
try { |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1141 |
type = ClassFinder.findClass(name, type.getClassLoader()); |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1142 |
// Each customizer should inherit java.awt.Component and implement java.beans.Customizer |
8760
83843c0b84f7
7021517: java.beans code comments have issues with HTML4 compliance
malenkov
parents:
7249
diff
changeset
|
1143 |
// according to the section 9.3 of JavaBeans™ specification |
7249
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1144 |
if (Component.class.isAssignableFrom(type) && Customizer.class.isAssignableFrom(type)) { |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1145 |
return type; |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1146 |
} |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1147 |
} |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1148 |
catch (Exception exception) { |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1149 |
// ignore any exceptions |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1150 |
} |
34380acce3b6
6447751: Bean Customizer should be detectable by reflection name alone
malenkov
parents:
6657
diff
changeset
|
1151 |
return null; |
2 | 1152 |
} |
1153 |
||
1154 |
private boolean isEventHandler(Method m) { |
|
1155 |
// We assume that a method is an event handler if it has a single |
|
1156 |
// argument, whose type inherit from java.util.Event. |
|
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
1157 |
Type[] argTypes = m.getGenericParameterTypes(); |
2 | 1158 |
if (argTypes.length != 1) { |
1159 |
return false; |
|
1160 |
} |
|
13356 | 1161 |
return isSubclass(TypeResolver.erase(TypeResolver.resolveInClass(beanClass, argTypes[0])), EventObject.class); |
2 | 1162 |
} |
1163 |
||
1164 |
//====================================================================== |
|
1165 |
// Package private support methods. |
|
1166 |
//====================================================================== |
|
1167 |
||
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1168 |
/** |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1169 |
* Internal support for finding a target methodName with a given |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1170 |
* parameter list on a given class. |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1171 |
*/ |
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1172 |
private static Method internalFindMethod(Class<?> start, String methodName, |
52248
2e330da7cbf4
8211300: Convert C-style array declarations in JDK client code
tvaleev
parents:
47216
diff
changeset
|
1173 |
int argCount, Class<?>[] args) { |
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1174 |
// For overriden methods we need to find the most derived version. |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1175 |
// So we start with the given class and walk up the superclass chain. |
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1176 |
for (Class<?> cl = start; cl != null; cl = cl.getSuperclass()) { |
25566
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
1177 |
for (Method method : ClassInfo.get(cl).getMethods()) { |
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1178 |
// make sure method signature matches. |
13356 | 1179 |
if (method.getName().equals(methodName)) { |
1180 |
Type[] params = method.getGenericParameterTypes(); |
|
1181 |
if (params.length == argCount) { |
|
1182 |
if (args != null) { |
|
1183 |
boolean different = false; |
|
1184 |
if (argCount > 0) { |
|
1185 |
for (int j = 0; j < argCount; j++) { |
|
1186 |
if (TypeResolver.erase(TypeResolver.resolveInClass(start, params[j])) != args[j]) { |
|
1187 |
different = true; |
|
1188 |
continue; |
|
1189 |
} |
|
1190 |
} |
|
1191 |
if (different) { |
|
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1192 |
continue; |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1193 |
} |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1194 |
} |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1195 |
} |
13356 | 1196 |
return method; |
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1197 |
} |
2 | 1198 |
} |
1199 |
} |
|
1200 |
} |
|
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1201 |
// Now check any inherited interfaces. This is necessary both when |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1202 |
// the argument class is itself an interface, and when the argument |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1203 |
// class is an abstract class. |
25123
1f70b30da563
8042860: Fix raw and unchecked warnings in java.beans
darcy
parents:
24177
diff
changeset
|
1204 |
Class<?>[] ifcs = start.getInterfaces(); |
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1205 |
for (int i = 0 ; i < ifcs.length; i++) { |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1206 |
// Note: The original implementation had both methods calling |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1207 |
// the 3 arg method. This is preserved but perhaps it should |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1208 |
// pass the args array instead of null. |
25566
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
1209 |
Method method = internalFindMethod(ifcs[i], methodName, argCount, null); |
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1210 |
if (method != null) { |
25566
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
1211 |
return method; |
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1212 |
} |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1213 |
} |
25566
ba387c302edd
4058433: RFE: tool for creating BeanInfo template
malenkov
parents:
25144
diff
changeset
|
1214 |
return null; |
2 | 1215 |
} |
1216 |
||
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1217 |
/** |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1218 |
* Find a target methodName on a given class. |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1219 |
*/ |
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1220 |
static Method findMethod(Class<?> cls, String methodName, int argCount) { |
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1221 |
return findMethod(cls, methodName, argCount, null); |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1222 |
} |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1223 |
|
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1224 |
/** |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1225 |
* Find a target methodName with specific parameter list on a given class. |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1226 |
* <p> |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1227 |
* Used in the contructors of the EventSetDescriptor, |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1228 |
* PropertyDescriptor and the IndexedPropertyDescriptor. |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1229 |
* <p> |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1230 |
* @param cls The Class object on which to retrieve the method. |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1231 |
* @param methodName Name of the method. |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1232 |
* @param argCount Number of arguments for the desired method. |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1233 |
* @param args Array of argument types for the method. |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1234 |
* @return the method or null if not found |
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1235 |
*/ |
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1236 |
static Method findMethod(Class<?> cls, String methodName, int argCount, |
25123
1f70b30da563
8042860: Fix raw and unchecked warnings in java.beans
darcy
parents:
24177
diff
changeset
|
1237 |
Class<?>[] args) { |
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1238 |
if (methodName == null) { |
2 | 1239 |
return null; |
1240 |
} |
|
6657
15dbb366c6a3
6976577: JCK7 api/java_beans/EventSetDescriptor/descriptions.html#Ctor1 fails since jdk7 b102
malenkov
parents:
5959
diff
changeset
|
1241 |
return internalFindMethod(cls, methodName, argCount, args); |
2 | 1242 |
} |
1243 |
||
1244 |
/** |
|
1245 |
* Return true if class a is either equivalent to class b, or |
|
1246 |
* if class a is a subclass of class b, i.e. if a either "extends" |
|
1247 |
* or "implements" b. |
|
1248 |
* Note tht either or both "Class" objects may represent interfaces. |
|
1249 |
*/ |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1250 |
static boolean isSubclass(Class<?> a, Class<?> b) { |
2 | 1251 |
// We rely on the fact that for any given java class or |
1252 |
// primtitive type there is a unqiue Class object, so |
|
1253 |
// we can use object equivalence in the comparisons. |
|
1254 |
if (a == b) { |
|
1255 |
return true; |
|
1256 |
} |
|
1257 |
if (a == null || b == null) { |
|
1258 |
return false; |
|
1259 |
} |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1260 |
for (Class<?> x = a; x != null; x = x.getSuperclass()) { |
2 | 1261 |
if (x == b) { |
1262 |
return true; |
|
1263 |
} |
|
1264 |
if (b.isInterface()) { |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1265 |
Class<?>[] interfaces = x.getInterfaces(); |
2 | 1266 |
for (int i = 0; i < interfaces.length; i++) { |
1267 |
if (isSubclass(interfaces[i], b)) { |
|
1268 |
return true; |
|
1269 |
} |
|
1270 |
} |
|
1271 |
} |
|
1272 |
} |
|
1273 |
return false; |
|
1274 |
} |
|
1275 |
||
1276 |
/** |
|
1277 |
* Try to create an instance of a named class. |
|
1278 |
* First try the classloader of "sibling", then try the system |
|
1279 |
* classloader then the class loader of the current Thread. |
|
1280 |
*/ |
|
42218
35e0972b2533
8169887: javax/swing/JEditorPane/8080972/TestJEditor.java, javax/swing/text/View/8080972/TestObjectView.java are failing
prr
parents:
42208
diff
changeset
|
1281 |
@SuppressWarnings("deprecation") |
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1282 |
static Object instantiate(Class<?> sibling, String className) |
2 | 1283 |
throws InstantiationException, IllegalAccessException, |
42208
7c1017f0ade5
8155874: Fix java.desktop deprecation warnings about Class.newInstance
prr
parents:
35667
diff
changeset
|
1284 |
NoSuchMethodException, InvocationTargetException, |
2 | 1285 |
ClassNotFoundException { |
1286 |
// First check with sibling's classloader (if any). |
|
1287 |
ClassLoader cl = sibling.getClassLoader(); |
|
11120
f8576c769572
7116954: Misc warnings in java.beans/java.beans.context
mcimadamore
parents:
9035
diff
changeset
|
1288 |
Class<?> cls = ClassFinder.findClass(className, cl); |
42218
35e0972b2533
8169887: javax/swing/JEditorPane/8080972/TestJEditor.java, javax/swing/text/View/8080972/TestObjectView.java are failing
prr
parents:
42208
diff
changeset
|
1289 |
return cls.newInstance(); |
2 | 1290 |
} |
1291 |
||
1292 |
} // end class Introspector |
|
1293 |
||
1294 |
//=========================================================================== |
|
1295 |
||
1296 |
/** |
|
1297 |
* Package private implementation support class for Introspector's |
|
1298 |
* internal use. |
|
1299 |
* <p> |
|
1300 |
* Mostly this is used as a placeholder for the descriptors. |
|
1301 |
*/ |
|
1302 |
||
1303 |
class GenericBeanInfo extends SimpleBeanInfo { |
|
1304 |
||
1305 |
private BeanDescriptor beanDescriptor; |
|
1306 |
private EventSetDescriptor[] events; |
|
1307 |
private int defaultEvent; |
|
1308 |
private PropertyDescriptor[] properties; |
|
1309 |
private int defaultProperty; |
|
1310 |
private MethodDescriptor[] methods; |
|
13654
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1311 |
private Reference<BeanInfo> targetBeanInfoRef; |
2 | 1312 |
|
1313 |
public GenericBeanInfo(BeanDescriptor beanDescriptor, |
|
1314 |
EventSetDescriptor[] events, int defaultEvent, |
|
1315 |
PropertyDescriptor[] properties, int defaultProperty, |
|
1316 |
MethodDescriptor[] methods, BeanInfo targetBeanInfo) { |
|
1317 |
this.beanDescriptor = beanDescriptor; |
|
1318 |
this.events = events; |
|
1319 |
this.defaultEvent = defaultEvent; |
|
1320 |
this.properties = properties; |
|
1321 |
this.defaultProperty = defaultProperty; |
|
1322 |
this.methods = methods; |
|
13654
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1323 |
this.targetBeanInfoRef = (targetBeanInfo != null) |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1324 |
? new SoftReference<>(targetBeanInfo) |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1325 |
: null; |
2 | 1326 |
} |
1327 |
||
1328 |
/** |
|
1329 |
* Package-private dup constructor |
|
1330 |
* This must isolate the new object from any changes to the old object. |
|
1331 |
*/ |
|
1332 |
GenericBeanInfo(GenericBeanInfo old) { |
|
1333 |
||
1334 |
beanDescriptor = new BeanDescriptor(old.beanDescriptor); |
|
1335 |
if (old.events != null) { |
|
1336 |
int len = old.events.length; |
|
1337 |
events = new EventSetDescriptor[len]; |
|
1338 |
for (int i = 0; i < len; i++) { |
|
1339 |
events[i] = new EventSetDescriptor(old.events[i]); |
|
1340 |
} |
|
1341 |
} |
|
1342 |
defaultEvent = old.defaultEvent; |
|
1343 |
if (old.properties != null) { |
|
1344 |
int len = old.properties.length; |
|
1345 |
properties = new PropertyDescriptor[len]; |
|
1346 |
for (int i = 0; i < len; i++) { |
|
1347 |
PropertyDescriptor oldp = old.properties[i]; |
|
1348 |
if (oldp instanceof IndexedPropertyDescriptor) { |
|
1349 |
properties[i] = new IndexedPropertyDescriptor( |
|
1350 |
(IndexedPropertyDescriptor) oldp); |
|
1351 |
} else { |
|
1352 |
properties[i] = new PropertyDescriptor(oldp); |
|
1353 |
} |
|
1354 |
} |
|
1355 |
} |
|
1356 |
defaultProperty = old.defaultProperty; |
|
1357 |
if (old.methods != null) { |
|
1358 |
int len = old.methods.length; |
|
1359 |
methods = new MethodDescriptor[len]; |
|
1360 |
for (int i = 0; i < len; i++) { |
|
1361 |
methods[i] = new MethodDescriptor(old.methods[i]); |
|
1362 |
} |
|
1363 |
} |
|
4851
4f7de5eeeac7
6921057: REGRESSION: persistence delegate issue on Windows and Linux against 5.u23b03/6u17b11
malenkov
parents:
4393
diff
changeset
|
1364 |
this.targetBeanInfoRef = old.targetBeanInfoRef; |
2 | 1365 |
} |
1366 |
||
1367 |
public PropertyDescriptor[] getPropertyDescriptors() { |
|
1368 |
return properties; |
|
1369 |
} |
|
1370 |
||
1371 |
public int getDefaultPropertyIndex() { |
|
1372 |
return defaultProperty; |
|
1373 |
} |
|
1374 |
||
1375 |
public EventSetDescriptor[] getEventSetDescriptors() { |
|
1376 |
return events; |
|
1377 |
} |
|
1378 |
||
1379 |
public int getDefaultEventIndex() { |
|
1380 |
return defaultEvent; |
|
1381 |
} |
|
1382 |
||
1383 |
public MethodDescriptor[] getMethodDescriptors() { |
|
1384 |
return methods; |
|
1385 |
} |
|
1386 |
||
1387 |
public BeanDescriptor getBeanDescriptor() { |
|
1388 |
return beanDescriptor; |
|
1389 |
} |
|
1390 |
||
1391 |
public java.awt.Image getIcon(int iconKind) { |
|
13654
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1392 |
BeanInfo targetBeanInfo = getTargetBeanInfo(); |
2 | 1393 |
if (targetBeanInfo != null) { |
1394 |
return targetBeanInfo.getIcon(iconKind); |
|
1395 |
} |
|
1396 |
return super.getIcon(iconKind); |
|
1397 |
} |
|
13654
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1398 |
|
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1399 |
private BeanInfo getTargetBeanInfo() { |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1400 |
if (this.targetBeanInfoRef == null) { |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1401 |
return null; |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1402 |
} |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1403 |
BeanInfo targetBeanInfo = this.targetBeanInfoRef.get(); |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1404 |
if (targetBeanInfo == null) { |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1405 |
targetBeanInfo = ThreadGroupContext.getContext().getBeanInfoFinder() |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1406 |
.find(this.beanDescriptor.getBeanClass()); |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1407 |
if (targetBeanInfo != null) { |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1408 |
this.targetBeanInfoRef = new SoftReference<>(targetBeanInfo); |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1409 |
} |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1410 |
} |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1411 |
return targetBeanInfo; |
9a35ae08fd2b
7195106: REGRESSION : There is no way to get Icon inf, once Softreference is released
malenkov
parents:
13356
diff
changeset
|
1412 |
} |
2 | 1413 |
} |