From: Finn B. <bc...@us...> - 2001-08-19 19:57:47
|
Update of /cvsroot/jython/jython/org/python/core In directory usw-pr-cvs1:/tmp/cvs-serv1614 Modified Files: PyJavaClass.java PyJavaInnerClass.java Log Message: Fix [ #440660 ] using nested java cls @ level >2 fails Index: PyJavaClass.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyJavaClass.java,v retrieving revision 2.37 retrieving revision 2.38 diff -C2 -d -r2.37 -r2.38 *** PyJavaClass.java 2001/08/19 19:17:44 2.37 --- PyJavaClass.java 2001/08/19 19:57:45 2.38 *************** *** 810,814 **** private PyObject findInnerClass(String name) { ! Class innerClass = Py.relFindClass(getProxyClass(),__name__+"$"+name); if (innerClass == null) return null; --- 810,815 ---- private PyObject findInnerClass(String name) { ! Class p = getProxyClass(); ! Class innerClass = Py.relFindClass(p, p.getName()+"$"+name); if (innerClass == null) return null; Index: PyJavaInnerClass.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyJavaInnerClass.java,v retrieving revision 2.8 retrieving revision 2.9 diff -C2 -d -r2.8 -r2.9 *** PyJavaInnerClass.java 2001/02/25 16:47:44 2.8 --- PyJavaInnerClass.java 2001/08/19 19:57:45 2.9 *************** *** 14,22 **** super(c); this.parent = parent; ! int dollar = __name__.indexOf('$'); ! if (dollar != -1) { ! __name__ = __name__.substring(0, dollar)+ ! "." + __name__.substring(dollar+1, __name__.length()); ! } } --- 14,19 ---- super(c); this.parent = parent; ! String pname = parent.__name__; ! __name__ = pname + "." + __name__.substring(pname.length() + 1); } |