Don't extend PyReflectedField in PyBeanEventProperty. Fixes Issue1377 by keeping PyJavaType from accessing field spuriously on PyBeanEventProperties.

groves · groves · commit 871214a2f6bc · 2009-06-23T06:51:07.000Z
diff --git a/src/org/python/core/PyBeanEventProperty.java b/src/org/python/core/PyBeanEventProperty.java
@@ -9,7 +9,7 @@
 
 import org.python.util.Generic;
 
-public class PyBeanEventProperty extends PyReflectedField {
+public class PyBeanEventProperty extends PyObject {
 
     private static Map<String, Class<?>> adapterClasses = Generic.map();
 
@@ -38,6 +38,7 @@ public PyBeanEventProperty(String eventName,
         this.eventClass = eventClass;
     }
 
+    @Override
     public PyObject _doget(PyObject self) {
         if (self == null) {
             return this;
@@ -65,6 +66,7 @@ public PyObject _doget(PyObject self) {
         return func;
     }
 
+    @Override
     public boolean _doset(PyObject self, PyObject value) {
         Object jself = Py.tojava(self, addMethod.getDeclaringClass());
         if (!(value instanceof PyCompoundCallable)) {
@@ -77,6 +79,7 @@ public boolean _doset(PyObject self, PyObject value) {
         return true;
     }
 
+    @Override
     public String toString() {
         return "<beanEventProperty " + __name__ + " for event " + eventClass.toString() + " "
                 + Py.idstr(this) + ">";
diff --git a/src/org/python/core/PyBeanProperty.java b/src/org/python/core/PyBeanProperty.java
@@ -14,6 +14,7 @@ public PyBeanProperty(String name, Class<?> myType, Method getMethod, Method set
         this.myType = myType;
     }
 
+    @Override
     public PyObject _doget(PyObject self) {
         if (self == null) {
             if (field != null) {
@@ -36,6 +37,7 @@ public PyObject _doget(PyObject self) {
         }
     }
 
+    @Override
     public boolean _doset(PyObject self, PyObject value) {
         if (self == null) {
             if (field != null) {
@@ -72,6 +74,7 @@ public PyBeanProperty copy() {
         return new PyBeanProperty(__name__, myType, getMethod, setMethod);
     }
 
+    @Override
     public String toString() {
         String typeName = "unknown";
         if (myType != null) {
diff --git a/src/org/python/core/PyJavaType.java b/src/org/python/core/PyJavaType.java
@@ -56,8 +56,10 @@ public PyJavaType() {
         super(TYPE == null ? fromClass(PyType.class) : TYPE);
     }
 
+    @Override
     protected boolean useMetatypeFirst(PyObject attr) {
-        return !(attr instanceof PyReflectedField || attr instanceof PyReflectedFunction);
+        return !(attr instanceof PyReflectedField || attr instanceof PyReflectedFunction ||
+                attr instanceof PyBeanEventProperty);
     }
 
     // Java types are ok with things being added and removed from their dicts as long as there isn't
diff --git a/src/org/python/core/PyReflectedField.java b/src/org/python/core/PyReflectedField.java
@@ -4,7 +4,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
-
 public class PyReflectedField extends PyObject {
     public Field field;
 
@@ -14,6 +13,7 @@ public PyReflectedField(Field field) {
         this.field = field;
     }
 
+    @Override
     public PyObject _doget(PyObject self) {
         Object iself = null;
         if (!Modifier.isStatic(field.getModifiers())) {
@@ -32,6 +32,7 @@ public PyObject _doget(PyObject self) {
         return Py.java2py(value);
     }
 
+    @Override
     public boolean _doset(PyObject self, PyObject value) {
         Object iself = null;
         if (!Modifier.isStatic(field.getModifiers())) {
@@ -51,6 +52,7 @@ public boolean _doset(PyObject self, PyObject value) {
         return true;
     }
 
+    @Override
     public String toString() {
         return "<reflected field "+field.toString()+" "+Py.idstr(this)+">";
     }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public PyBeanProperty(String name, Class<?> myType, Method getMethod, Method set`
`14`	`14`	`this.myType = myType;`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ @Override`
`17`	`18`	`public PyObject _doget(PyObject self) {`
`18`	`19`	`if (self == null) {`
`19`	`20`	`if (field != null) {`
`@@ -36,6 +37,7 @@ public PyObject _doget(PyObject self) {`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`
	`40`	`+ @Override`
`39`	`41`	`public boolean _doset(PyObject self, PyObject value) {`
`40`	`42`	`if (self == null) {`
`41`	`43`	`if (field != null) {`
`@@ -72,6 +74,7 @@ public PyBeanProperty copy() {`
`72`	`74`	`return new PyBeanProperty(__name__, myType, getMethod, setMethod);`
`73`	`75`	`}`
`74`	`76`
	`77`	`+ @Override`
`75`	`78`	`public String toString() {`
`76`	`79`	`String typeName = "unknown";`
`77`	`80`	`if (myType != null) {`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,10 @@ public PyJavaType() {`
`56`	`56`	`super(TYPE == null ? fromClass(PyType.class) : TYPE);`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ @Override`
`59`	`60`	`protected boolean useMetatypeFirst(PyObject attr) {`
`60`		`- return !(attr instanceof PyReflectedField \|\| attr instanceof PyReflectedFunction);`
	`61`	`+ return !(attr instanceof PyReflectedField \|\| attr instanceof PyReflectedFunction \|\|`
	`62`	`+ attr instanceof PyBeanEventProperty);`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`// Java types are ok with things being added and removed from their dicts as long as there isn't`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`import java.lang.reflect.Field;`
`5`	`5`	`import java.lang.reflect.Modifier;`
`6`	`6`
`7`		`-`
`8`	`7`	`public class PyReflectedField extends PyObject {`
`9`	`8`	`public Field field;`
`10`	`9`
`@@ -14,6 +13,7 @@ public PyReflectedField(Field field) {`
`14`	`13`	`this.field = field;`
`15`	`14`	`}`
`16`	`15`
	`16`	`+ @Override`
`17`	`17`	`public PyObject _doget(PyObject self) {`
`18`	`18`	`Object iself = null;`
`19`	`19`	`if (!Modifier.isStatic(field.getModifiers())) {`
`@@ -32,6 +32,7 @@ public PyObject _doget(PyObject self) {`
`32`	`32`	`return Py.java2py(value);`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ @Override`
`35`	`36`	`public boolean _doset(PyObject self, PyObject value) {`
`36`	`37`	`Object iself = null;`
`37`	`38`	`if (!Modifier.isStatic(field.getModifiers())) {`
`@@ -51,6 +52,7 @@ public boolean _doset(PyObject self, PyObject value) {`
`51`	`52`	`return true;`
`52`	`53`	`}`
`53`	`54`
	`55`	`+ @Override`
`54`	`56`	`public String toString() {`
`55`	`57`	`return "<reflected field "+field.toString()+" "+Py.idstr(this)+">";`
`56`	`58`	`}`