From 79b564a3389088ccb87a010be52ddb34f7262a47 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Mon, 20 Aug 2012 11:08:32 +0200 Subject: [PATCH] renaming to JavaMultipleMethod. --- jnius/jnius_export_class.pxi | 12 ++++++------ jnius/reflect.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jnius/jnius_export_class.pxi b/jnius/jnius_export_class.pxi index b0739ba..1f00ec2 100644 --- a/jnius/jnius_export_class.pxi +++ b/jnius/jnius_export_class.pxi @@ -60,7 +60,7 @@ class MetaJavaClass(type): # search all the static JavaMethod within our class, and resolve them cdef JavaMethod jm - cdef JavaMethodMultiple jmm + cdef JavaMultipleMethod jmm for name, value in classDict.iteritems(): if isinstance(value, JavaMethod): jm = value @@ -68,7 +68,7 @@ class MetaJavaClass(type): continue jm.set_resolve_info(jcs.j_env, jcs.j_cls, None, name, __javaclass__) - elif isinstance(value, JavaMethodMultiple): + elif isinstance(value, JavaMultipleMethod): jmm = value jmm.set_resolve_info(jcs.j_env, jcs.j_cls, None, name, __javaclass__) @@ -182,7 +182,7 @@ cdef class JavaClass(object): cdef void resolve_methods(self) except *: # search all the JavaMethod within our class, and resolve them cdef JavaMethod jm - cdef JavaMethodMultiple jmm + cdef JavaMultipleMethod jmm for name, value in self.__class__.__dict__.iteritems(): if isinstance(value, JavaMethod): jm = value @@ -190,7 +190,7 @@ cdef class JavaClass(object): continue jm.set_resolve_info(self.j_env, self.j_cls, self.j_self, name, self.__javaclass__) - elif isinstance(value, JavaMethodMultiple): + elif isinstance(value, JavaMultipleMethod): jmm = value jmm.set_resolve_info(self.j_env, self.j_cls, self.j_self, name, self.__javaclass__) @@ -650,7 +650,7 @@ cdef class JavaMethod(object): return ret -cdef class JavaMethodMultiple(object): +cdef class JavaMultipleMethod(object): cdef LocalRef j_self cdef list definitions @@ -663,7 +663,7 @@ cdef class JavaMethodMultiple(object): self.j_self = None def __init__(self, definitions, **kwargs): - super(JavaMethodMultiple, self).__init__() + super(JavaMultipleMethod, self).__init__() self.definitions = definitions self.static_methods = {} self.instance_methods = {} diff --git a/jnius/reflect.py b/jnius/reflect.py index ffc29c5..ed33cf9 100644 --- a/jnius/reflect.py +++ b/jnius/reflect.py @@ -1,7 +1,7 @@ __all__ = ('autoclass', 'ensureclass') from jnius import JavaClass, MetaJavaClass, JavaMethod, JavaStaticMethod, \ - JavaField, JavaStaticField, JavaMethodMultiple, find_javaclass + JavaField, JavaStaticField, JavaMultipleMethod, find_javaclass class Class(JavaClass): __metaclass__ = MetaJavaClass @@ -160,7 +160,7 @@ def autoclass(clsname): ''' signatures.append((sig, Modifier.isStatic(method.getModifiers()))) - classDict[name] = JavaMethodMultiple(signatures) + classDict[name] = JavaMultipleMethod(signatures) for field in c.getFields(): static = Modifier.isStatic(field.getModifiers())