test/fix overloaded synchronized methods

bdkearns · bdkearns · commit 7120676a728d · 2014-10-14T01:54:52.000-04:00
diff --git a/java2python/config/default.py b/java2python/config/default.py
@@ -97,9 +97,9 @@
 methodPrologueHandlers = [
     basic.maybeAbstractMethod,
     basic.maybeClassMethod,
+    basic.overloadedClassMethods,
     # NB:  synchronized should come after classmethod
     basic.maybeSynchronizedMethod,
-    basic.overloadedClassMethods,
 ]
 
 
diff --git a/java2python/mod/include/classmethod.py b/java2python/mod/include/classmethod.py
@@ -0,0 +1,6 @@
+class classmethod_(classmethod):
+    """ Classmethod that provides attribute delegation.
+
+    """
+    def __getattr__(self, name):
+        return getattr(self.__func__, name)
diff --git a/test/Synchronized2.java b/test/Synchronized2.java
@@ -0,0 +1,36 @@
+class Synchronized2 {
+
+    public synchronized void test1() {
+        System.out.println(1);
+    }
+
+    public synchronized void test1(String s) {
+        System.out.println(s);
+    }
+
+    public static synchronized void test1(int i) {
+        System.out.println(i);
+    }
+
+    public static synchronized void test2() {
+        System.out.println(2);
+    }
+
+    public static synchronized void test2(String s) {
+        System.out.println(s);
+    }
+
+    public synchronized void test2(int i) {
+        System.out.println(i);
+    }
+
+    public static void main(String[] args) {
+        Synchronized2 obj = new Synchronized2();
+        obj.test1();
+        obj.test1("test1");
+        obj.test1(1);
+        obj.test2();
+        obj.test2("test2");
+        obj.test2(2);
+    }
+}
diff --git a/test/configs/defaults.py b/test/configs/defaults.py
@@ -4,6 +4,7 @@
 
 
 modulePrologueHandlers = default.modulePrologueHandlers + [
+    'from java2python.mod.include.classmethod import classmethod_ as classmethod',
     'from java2python.mod.include.overloading import overloaded',
     'from abc import ABCMeta, abstractmethod',
     'import zope.interface',

Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,9 @@`
`97`	`97`	`methodPrologueHandlers = [`
`98`	`98`	`basic.maybeAbstractMethod,`
`99`	`99`	`basic.maybeClassMethod,`
	`100`	`+ basic.overloadedClassMethods,`
`100`	`101`	`# NB: synchronized should come after classmethod`
`101`	`102`	`basic.maybeSynchronizedMethod,`
`102`		`- basic.overloadedClassMethods,`
`103`	`103`	`]`
`104`	`104`
`105`	`105`