Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug where a bean property can conflict with a method name.

Browse Source
This commit is contained in:
norris%netscape.com 2000-04-18 16:52:00 +00:00
parent 3ef540f70d
commit 564f1dca5b
2 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/rhino/org/mozilla/javascript/JavaMembers.java
View File

@ -369,25 +369,10 @@ class JavaMembers {
nameComponent.substring(1);
}
// If we already have a field by this name, don't do this
// If we already have a member by this name, don't do this
// property.
if (ht.containsKey(beanPropertyName)) {
// Exclude field.
Object propertyMethod = ht.get(beanPropertyName);
if (propertyMethod instanceof Field)
continue;
// Exclude when there's a method with non-bean
// characteristics or non-static affinity.
Method[] methods = ((NativeJavaMethod) propertyMethod).getMethods();
boolean exclude = false;
for (int i = 0; i < methods.length; ++i)
if (Modifier.isStatic(methods[i].getModifiers()) != isStatic ||
methods[i].getParameterTypes().length > 0)
exclude = true;
if (exclude)
continue;
}
if (ht.containsKey(beanPropertyName))
continue;
// Get the method by this name.
Object method = ht.get(name);

21
js/rhino/src/org/mozilla/javascript/JavaMembers.java
View File

@ -369,25 +369,10 @@ class JavaMembers {
nameComponent.substring(1);
}
// If we already have a field by this name, don't do this
// If we already have a member by this name, don't do this
// property.
if (ht.containsKey(beanPropertyName)) {
// Exclude field.
Object propertyMethod = ht.get(beanPropertyName);
if (propertyMethod instanceof Field)
continue;
// Exclude when there's a method with non-bean
// characteristics or non-static affinity.
Method[] methods = ((NativeJavaMethod) propertyMethod).getMethods();
boolean exclude = false;
for (int i = 0; i < methods.length; ++i)
if (Modifier.isStatic(methods[i].getModifiers()) != isStatic ||
methods[i].getParameterTypes().length > 0)
exclude = true;
if (exclude)
continue;
}
if (ht.containsKey(beanPropertyName))
continue;
// Get the method by this name.
Object method = ht.get(name);